Merge lp:~linuxjedi/drizzle/trunk-bug-713347 into lp:drizzle/7.0

[Andrew Hutchings]

Implicit joins of the form "SELECT * FROM t1, t2" without WHERE or ON now error.

[lp:~linuxjedi/drizzle/trunk-bug-713347]

2144. By Andrew Hutchings on 2011-02-07

Merge with trunk

=== modified file 'drizzled/error.cc'
--- drizzled/error.cc	2011-02-04 09:28:16 +0000
+++ drizzled/error.cc	2011-02-07 17:26:32 +0000
@@ -503,7 +503,7 @@
   ADD_ERROR_MESSAGE(ER_USE_SQL_BIG_RESULT, N_("Temporary table too large, rerun with SQL_BIG_RESULT."));
   ADD_ERROR_MESSAGE(ER_UNKNOWN_ENGINE_OPTION, N_("Unknown table engine option key/pair %s = %s."));
   ADD_ERROR_MESSAGE(ER_UNKNOWN_SCHEMA_OPTION, N_("Unknown schema engine option key/pair %s = %s."));
-
+  ADD_ERROR_MESSAGE(ER_CARTESIAN_JOIN_ATTEMPTED, N_("Implicit cartesian join attempted."));
   ADD_ERROR_MESSAGE(ER_ADMIN_ACCESS, N_("Admin access not allowed from this username/IP address."));
 
   // User lock/barrier error messages

=== modified file 'drizzled/error_t.h'
--- drizzled/error_t.h	2011-02-04 09:28:16 +0000
+++ drizzled/error_t.h	2011-02-07 17:26:32 +0000
@@ -864,7 +864,8 @@
   ER_INVALID_DATE_VALUE,
   ER_TRANSACTIONAL_DDL_NOT_SUPPORTED,
   ER_USE_DATA_DICTIONARY,
-  ER_TRANSACTION_ALREADY_STARTED
+  ER_TRANSACTION_ALREADY_STARTED,
+  ER_CARTESIAN_JOIN_ATTEMPTED
 };
 
 

=== modified file 'drizzled/join.cc'
--- drizzled/join.cc	2011-02-04 19:50:47 +0000
+++ drizzled/join.cc	2011-02-07 17:26:32 +0000
@@ -4623,6 +4623,12 @@
           join->full_join= 1;
       }
 
+      if (join->full_join and not session->lex->current_select->is_cross and not cond)
+      {
+        my_error(ER_CARTESIAN_JOIN_ATTEMPTED, MYF(0));
+        return 1;
+      }
+
       tmp= NULL;
       if (cond)
         tmp= make_cond_for_table(cond,used_tables,current_map, 0);
@@ -5877,6 +5883,7 @@
       s->quick=select->quick;
       s->needed_reg=select->needed_reg;
       select->quick=0;
+
       if (records == 0 && s->table->reginfo.impossible_range)
       {
         /*

=== modified file 'drizzled/sql_lex.cc'
--- drizzled/sql_lex.cc	2011-01-24 23:10:42 +0000
+++ drizzled/sql_lex.cc	2011-02-07 17:26:32 +0000
@@ -1397,6 +1397,7 @@
   select_limit= 0;      /* denotes the default limit = HA_POS_ERROR */
   offset_limit= 0;      /* denotes the default offset = 0 */
   with_sum_func= 0;
+  is_cross= false;
   is_correlated= 0;
   cur_pos_in_select_list= UNDEF_POS;
   non_agg_fields.empty();

=== modified file 'drizzled/sql_lex.h'
--- drizzled/sql_lex.h	2011-01-24 23:10:42 +0000
+++ drizzled/sql_lex.h	2011-02-07 17:26:32 +0000
@@ -450,6 +450,7 @@
     n_sum_items(0),
     n_child_sum_items(0),
     explicit_limit(0),
+    is_cross(false),
     subquery_in_having(0),
     is_correlated(0),
     exclude_from_table_unique_test(0),
@@ -534,6 +535,10 @@
 
   /* explicit LIMIT clause was used */
   bool explicit_limit;
+
+  /* explicit CROSS JOIN was used */
+  bool is_cross;
+
   /*
     there are subquery in HAVING clause => we can't close tables before
     query processing end even if we use temporary table

=== modified file 'drizzled/sql_yacc.yy'
--- drizzled/sql_yacc.yy	2011-02-05 20:36:14 +0000
+++ drizzled/sql_yacc.yy	2011-02-07 17:26:32 +0000
@@ -3518,7 +3518,11 @@
 normal_join:
           JOIN_SYM {}
         | INNER_SYM JOIN_SYM {}
-        | CROSS JOIN_SYM { Lex->is_cross= true; }
+        | CROSS JOIN_SYM
+          {
+            Lex->is_cross= true;
+            Lex->current_select->is_cross= true;
+          }
         ;
 
 /*

=== modified file 'plugin/innobase/os/os0file.cc'
--- plugin/innobase/os/os0file.cc	2011-01-08 09:35:11 +0000
+++ plugin/innobase/os/os0file.cc	2011-02-07 17:26:32 +0000
@@ -662,7 +662,7 @@
 		if (errno == EAGAIN || errno == EACCES) {
 			fprintf(stderr,
 				"InnoDB: Check that you do not already have"
-				" another mysqld process\n"
+				" another drizzled process\n"
 				"InnoDB: using the same InnoDB data"
 				" or log files.\n");
 		}

=== modified file 'plugin/innobase/tests/r/func_group_innodb.result'
--- plugin/innobase/tests/r/func_group_innodb.result	2010-09-12 14:34:27 +0000
+++ plugin/innobase/tests/r/func_group_innodb.result	2011-02-07 17:26:32 +0000
@@ -76,11 +76,11 @@
 select min(7);
 min(7)
 7
-explain select min(7) from t2i join t1i;
+explain select min(7) from t2i cross join t1i;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2i	ALL	NULL	NULL	NULL	NULL	1	
 1	SIMPLE	t1i	ALL	NULL	NULL	NULL	NULL	1	Using join buffer
-select min(7) from t2i join t1i;
+select min(7) from t2i cross join t1i;
 min(7)
 NULL
 select max(a) from t1i;
@@ -92,11 +92,11 @@
 select max(7);
 max(7)
 7
-explain select max(7) from t2i join t1i;
+explain select max(7) from t2i cross join t1i;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2i	ALL	NULL	NULL	NULL	NULL	1	
 1	SIMPLE	t1i	ALL	NULL	NULL	NULL	NULL	1	Using join buffer
-select max(7) from t2i join t1i;
+select max(7) from t2i cross join t1i;
 max(7)
 NULL
 select 1, min(a) from t1i where a=99;

=== modified file 'plugin/innobase/tests/r/index_merge_innodb.result'
--- plugin/innobase/tests/r/index_merge_innodb.result	2010-12-08 22:35:56 +0000
+++ plugin/innobase/tests/r/index_merge_innodb.result	2011-02-07 17:26:32 +0000
@@ -97,7 +97,7 @@
 create table t2 (a int);
 insert into t2 values (0),(1),(2),(3),(4),(NULL);
 insert into t1 (key1a, key1b, key2a, key2b, key3a, key3b)
-select A.a, B.a, C.a, D.a, C.a, D.a from t2 A,t2 B,t2 C, t2 D;
+select A.a, B.a, C.a, D.a, C.a, D.a from t2 A CROSS JOIN t2 B CROSS JOIN t2 C CROSS JOIN t2 D;
 insert into t1 (key1a, key1b, key2a, key2b, key3a, key3b)
 select key1a, key1b, key2a, key2b, key3a, key3b from t1;
 insert into t1 (key1a, key1b, key2a, key2b, key3a, key3b)

=== modified file 'plugin/innobase/tests/r/innodb_mysql.result'
--- plugin/innobase/tests/r/innodb_mysql.result	2011-01-21 01:09:12 +0000
+++ plugin/innobase/tests/r/innodb_mysql.result	2011-02-07 17:26:32 +0000
@@ -277,7 +277,7 @@
 DELETE IGNORE FROM t1 WHERE i = 1;
 Warnings:
 Error	1451	Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`i`) REFERENCES `t1` (`i`) ON DELETE NO ACTION)
-SELECT * FROM t1, t2;
+SELECT * FROM t1 CROSS JOIN t2;
 i	i
 1	1
 DROP TABLE t2, t1;

=== modified file 'plugin/innobase/tests/t/func_group_innodb.test'
--- plugin/innobase/tests/t/func_group_innodb.test	2010-09-12 14:34:27 +0000
+++ plugin/innobase/tests/t/func_group_innodb.test	2011-02-07 17:26:32 +0000
@@ -53,14 +53,14 @@
 select min(a) from t1i;
 select min(7) from t1i;
 select min(7);
-explain select min(7) from t2i join t1i;
-select min(7) from t2i join t1i;
+explain select min(7) from t2i cross join t1i;
+select min(7) from t2i cross join t1i;
 
 select max(a) from t1i;
 select max(7) from t1i;
 select max(7);
-explain select max(7) from t2i join t1i;
-select max(7) from t2i join t1i;
+explain select max(7) from t2i cross join t1i;
+select max(7) from t2i cross join t1i;
 
 select 1, min(a) from t1i where a=99;
 select 1, min(a) from t1i where 1=99;

=== modified file 'plugin/session_dictionary/tests/r/data_dictionary.result'
--- plugin/session_dictionary/tests/r/data_dictionary.result	2011-01-18 18:10:43 +0000
+++ plugin/session_dictionary/tests/r/data_dictionary.result	2011-02-07 17:26:32 +0000
@@ -20,5 +20,5 @@
 1
 SELECT ASSERT(ID) FROM processlist;
 SELECT ID FROM processlist ORDER BY ID;
-SELECT a.ID FROM processlist as a, processlist as b ORDER BY ID;
-SELECT a.ID FROM processlist as a, data_dictionary.processlist as b;
+SELECT a.ID FROM processlist as a CROSS JOIN processlist as b ORDER BY ID;
+SELECT a.ID FROM processlist as a CROSS JOIN data_dictionary.processlist as b;

=== modified file 'plugin/session_dictionary/tests/t/data_dictionary.test'
--- plugin/session_dictionary/tests/t/data_dictionary.test	2011-01-18 18:10:43 +0000
+++ plugin/session_dictionary/tests/t/data_dictionary.test	2011-02-07 17:26:32 +0000
@@ -18,9 +18,9 @@
 SELECT ID FROM processlist ORDER BY ID;
 
 --replace_column 1 #
-SELECT a.ID FROM processlist as a, processlist as b ORDER BY ID;
+SELECT a.ID FROM processlist as a CROSS JOIN processlist as b ORDER BY ID;
 
 --replace_column 1 #
-SELECT a.ID FROM processlist as a, data_dictionary.processlist as b;
+SELECT a.ID FROM processlist as a CROSS JOIN data_dictionary.processlist as b;
 
 --enable_result_log

=== modified file 'plugin/table_cache_dictionary/tests/r/table_cache.result'
--- plugin/table_cache_dictionary/tests/r/table_cache.result	2011-01-10 01:11:06 +0000
+++ plugin/table_cache_dictionary/tests/r/table_cache.result	2011-02-07 17:26:32 +0000
@@ -20,7 +20,7 @@
 #	data_dictionary	table_cache	#	#	#	2112	#	#
 create table a ( a int);
 create table b ( b int);
-select * FROM a,b;
+select * FROM a CROSS JOIN b;
 a	b
 select * FROM data_dictionary.TABLE_CACHE ORDER BY TABLE_SCHEMA, TABLE_NAME;
 SESSION_ID	TABLE_SCHEMA	TABLE_NAME	VERSION	IS_NAME_LOCKED	ROWS	AVG_ROW_LENGTH	TABLE_SIZE	AUTO_INCREMENT

=== modified file 'plugin/table_cache_dictionary/tests/r/table_definition_cache.result'
--- plugin/table_cache_dictionary/tests/r/table_definition_cache.result	2010-12-24 08:41:24 +0000
+++ plugin/table_cache_dictionary/tests/r/table_definition_cache.result	2011-02-07 17:26:32 +0000
@@ -16,7 +16,7 @@
 #	table_definition_cache	#	#	#
 create table a ( a int);
 create table b ( b int);
-select * FROM a,b;
+select * FROM a CROSS JOIN b;
 a	b
 select * FROM data_dictionary.TABLE_DEFINITION_CACHE  ORDER BY TABLE_SCHEMA, TABLE_NAME;
 TABLE_SCHEMA	TABLE_NAME	VERSION	TABLE_COUNT	IS_NAME_LOCKED

=== modified file 'plugin/table_cache_dictionary/tests/t/table_cache.test'
--- plugin/table_cache_dictionary/tests/t/table_cache.test	2010-03-16 17:52:35 +0000
+++ plugin/table_cache_dictionary/tests/t/table_cache.test	2011-02-07 17:26:32 +0000
@@ -10,7 +10,7 @@
 
 create table a ( a int);
 create table b ( b int);
-select * FROM a,b;
+select * FROM a CROSS JOIN b;
 --replace_column 1 # 4 # 5 #  6 # 8 # 9 #
 select * FROM data_dictionary.TABLE_CACHE ORDER BY TABLE_SCHEMA, TABLE_NAME;
 

=== modified file 'plugin/table_cache_dictionary/tests/t/table_definition_cache.test'
--- plugin/table_cache_dictionary/tests/t/table_definition_cache.test	2010-03-16 01:56:17 +0000
+++ plugin/table_cache_dictionary/tests/t/table_definition_cache.test	2011-02-07 17:26:32 +0000
@@ -10,7 +10,7 @@
 
 create table a ( a int);
 create table b ( b int);
-select * FROM a,b;
+select * FROM a CROSS JOIN b;
 --replace_column 1 # 3 # 4 # 5 #
 select * FROM data_dictionary.TABLE_DEFINITION_CACHE  ORDER BY TABLE_SCHEMA, TABLE_NAME;
 

=== modified file 'tests/include/index_merge2.inc'
--- tests/include/index_merge2.inc	2010-12-08 22:35:56 +0000
+++ tests/include/index_merge2.inc	2011-02-07 17:26:32 +0000
@@ -118,7 +118,7 @@
 insert into t2 values (0),(1),(2),(3),(4),(NULL);
 
 insert into t1 (key1a, key1b, key2a, key2b, key3a, key3b)
-  select A.a, B.a, C.a, D.a, C.a, D.a from t2 A,t2 B,t2 C, t2 D;
+  select A.a, B.a, C.a, D.a, C.a, D.a from t2 A CROSS JOIN t2 B CROSS JOIN t2 C CROSS JOIN t2 D;
 insert into t1 (key1a, key1b, key2a, key2b, key3a, key3b)
   select key1a, key1b, key2a, key2b, key3a, key3b from t1;
 insert into t1 (key1a, key1b, key2a, key2b, key3a, key3b)

=== modified file 'tests/include/mix1.inc'
--- tests/include/mix1.inc	2011-02-01 18:23:24 +0000
+++ tests/include/mix1.inc	2011-02-07 17:26:32 +0000
@@ -317,7 +317,7 @@
 
 DELETE IGNORE FROM t1 WHERE i = 1;
 
-SELECT * FROM t1, t2;
+SELECT * FROM t1 CROSS JOIN t2;
 
 DROP TABLE t2, t1;
 

=== modified file 'tests/r/derived.result'
--- tests/r/derived.result	2009-08-04 02:33:47 +0000
+++ tests/r/derived.result	2011-02-07 17:26:32 +0000
@@ -37,7 +37,7 @@
 ERROR 42S22: Unknown column 'a' in 'where clause'
 SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1  HAVING a=1) as a;
 ERROR 42S22: Unknown column 'a' in 'having clause'
-select * from t1 as x1, (select * from t1) as x2;
+select * from t1 as x1, (select * from t1) as x2 where x1.a != 0;
 a	b	a	b
 1	a	1	a
 2	b	1	a
@@ -55,9 +55,9 @@
 2	b	3	c
 3	c	3	c
 3	c	3	c
-explain select * from t1 as x1, (select * from t1) as x2;
+explain select * from t1 as x1, (select * from t1) as x2 where x1.a != 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	x1	ALL	NULL	NULL	NULL	NULL	4	
+1	PRIMARY	x1	ALL	NULL	NULL	NULL	NULL	4	Using where
 1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	Using join buffer
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	4	
 drop table if exists  t2,t3;
@@ -140,9 +140,9 @@
 18	18
 19	19
 20	20
-explain select count(*) from t1 as tt1, (select * from t1) as tt2;
+explain select count(*) from t1 as tt1, (select * from t1) as tt2 where tt1.a != 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	tt1	index	NULL	a	4	NULL	X	Using index
+1	PRIMARY	tt1	range	a	a	4	NULL	X	Using where; Using index
 1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	X	Using join buffer
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	X	
 drop table t1;
@@ -225,15 +225,15 @@
 drop table t1;
 create table t1 (a int);
 insert into t1 values (1),(2);
-select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b;
+select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b where a.a != 0;
 a	a
 1	1
 2	1
 1	2
 2	2
-explain select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b;
+explain select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b where a.a != 0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	Using where
 1	PRIMARY	<derived4>	ALL	NULL	NULL	NULL	NULL	2	Using join buffer
 4	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	
 5	UNION	t1	ALL	NULL	NULL	NULL	NULL	2	
@@ -328,7 +328,7 @@
 drop table t1, t2, t3;
 create table t1 (a int);
 create table t2 (a int);
-select * from (select * from t1,t2) foo;
+select * from (select * from t1,t2 where t1.a != 0) foo;
 a	a
 drop table t1,t2;
 create table t1 (ID int not null auto_increment,

=== modified file 'tests/r/distinct.result'
--- tests/r/distinct.result	2010-08-21 22:42:44 +0000
+++ tests/r/distinct.result	2011-02-07 17:26:32 +0000
@@ -523,9 +523,7 @@
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	
 EXPLAIN SELECT DISTINCT t1_1.a, t1_1.b FROM t1 t1_1, t1 t1_2;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1_1	ALL	NULL	NULL	NULL	NULL	3	Using temporary
-1	SIMPLE	t1_2	index	NULL	PRIMARY	4	NULL	3	Using index; Distinct; Using join buffer
+ERROR HY000: Implicit cartesian join attempted.
 EXPLAIN SELECT DISTINCT t1_1.a, t1_1.b FROM t1 t1_1, t1 t1_2
 WHERE t1_1.a = t1_2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

=== modified file 'tests/r/func_gconcat.result'
--- tests/r/func_gconcat.result	2010-09-02 18:35:05 +0000
+++ tests/r/func_gconcat.result	2011-02-07 17:26:32 +0000
@@ -191,7 +191,7 @@
 create table t1(id int);
 create table t2(id int);
 insert into t1 values(0),(1);
-select group_concat(t1.id) FROM t1,t2;
+select group_concat(t1.id) FROM t1,t2 where t2.id < 2;
 group_concat(t1.id)
 NULL
 drop table t1;
@@ -321,7 +321,7 @@
 CREATE TABLE t2 ( a int );
 INSERT INTO t1 VALUES (1), (2);
 INSERT INTO t2 VALUES (1), (2);
-SELECT GROUP_CONCAT(t1.a*t2.a ORDER BY t2.a) FROM t1, t2 GROUP BY t1.a;
+SELECT GROUP_CONCAT(t1.a*t2.a ORDER BY t2.a) FROM t1, t2 WHERE t1.a < 3 GROUP BY t1.a;
 GROUP_CONCAT(t1.a*t2.a ORDER BY t2.a)
 1,2
 2,4
@@ -861,6 +861,7 @@
 FROM
 t1 AS t1,
 t1 AS t2
+WHERE t2.a IS NULL
 GROUP BY 1
 ) AS s1;
 d1

=== modified file 'tests/r/func_group.result'
--- tests/r/func_group.result	2010-12-02 04:36:22 +0000
+++ tests/r/func_group.result	2011-02-07 17:26:32 +0000
@@ -176,7 +176,7 @@
 select max(t1.a1), max(t2.a2) from t1, t2;
 max(t1.a1)	max(t2.a2)
 NULL	NULL
-select max(t1.a1) from t1, t2;
+select max(t1.a1) from t1, t2 where t1.a1 > 0;
 max(t1.a1)
 NULL
 select max(t2.a2), max(t1.a1) from t1, t2;
@@ -190,7 +190,7 @@
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No matching min/max row
 insert into t2 values('AAA', 10, 0.5);
 insert into t2 values('BBB', 20, 1.0);
-select t1.a1, t1.a2, t2.a1, t2.a2 from t1,t2;
+select t1.a1, t1.a2, t2.a1, t2.a2 from t1,t2 where t1.a1 > 0;
 a1	a2	a1	a2
 10	NULL	AAA	10
 10	NULL	BBB	20

=== modified file 'tests/r/func_in.result'
--- tests/r/func_in.result	2010-12-20 19:20:57 +0000
+++ tests/r/func_in.result	2011-02-07 17:26:32 +0000
@@ -219,7 +219,7 @@
 create table t1 (a int);
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create temporary table t2 (a int, filler char(200), key(a)) engine=myisam;
-insert into t2 select C.a*2,   'no'  from t1 A, t1 B, t1 C;
+insert into t2 select C.a*2,   'no'  from t1 A, t1 B, t1 C where A.a < 10;
 insert into t2 select C.a*2+1, 'yes' from t1 C;
 explain 
 select * from t2 where a NOT IN (0, 2,4,6,8,10,12,14,16,18);
@@ -271,9 +271,9 @@
 2006-04-25 10:19:00	yes
 drop table t2;
 create table t2 (a varchar(10), filler char(200), key(a));
-insert into t2 select 'foo', 'no' from t1 A, t1 B;
-insert into t2 select 'barbar', 'no' from t1 A, t1 B;
-insert into t2 select 'bazbazbaz', 'no' from t1 A, t1 B;
+insert into t2 select 'foo', 'no' from t1 A, t1 B where A.a < 10;
+insert into t2 select 'barbar', 'no' from t1 A, t1 B where A.a < 10;
+insert into t2 select 'bazbazbaz', 'no' from t1 A, t1 B where A.a < 10;
 insert into t2 values ('fon', '1'), ('fop','1'), ('barbaq','1'), 
 ('barbas','1'), ('bazbazbay', '1'),('zz','1');
 explain select * from t2 where a not in('foo','barbar', 'bazbazbaz');
@@ -281,9 +281,9 @@
 1	SIMPLE	t2	range	a	a	43	NULL	5	Using where
 drop table t2;
 create table t2 (a decimal(10,5), filler char(200), key(a));
-insert into t2 select 345.67890, 'no' from t1 A, t1 B;
-insert into t2 select 43245.34, 'no' from t1 A, t1 B;
-insert into t2 select 64224.56344, 'no' from t1 A, t1 B;
+insert into t2 select 345.67890, 'no' from t1 A, t1 B where A.a < 10;
+insert into t2 select 43245.34, 'no' from t1 A, t1 B where A.a < 10;
+insert into t2 select 64224.56344, 'no' from t1 A, t1 B where A.a < 10;
 insert into t2 values (0, '1'), (22334.123,'1'), (33333,'1'), 
 (55555,'1'), (77777, '1');
 explain
@@ -304,7 +304,7 @@
 set @str="update t2 set b=1 where a not in (";
 select count(*) from (
 select @str:=concat(@str, @cnt:=@cnt+1, ",") 
-from t1 A, t1 B, t1 C, t1 D) Z;
+from t1 A, t1 B, t1 C, t1 D  where A.a < 10) Z;
 count(*)
 10000
 set @str:=concat(@str, "10000)");

=== modified file 'tests/r/global_read_constraints.result'
--- tests/r/global_read_constraints.result	2010-11-01 20:27:03 +0000
+++ tests/r/global_read_constraints.result	2011-02-07 17:26:32 +0000
@@ -28,5 +28,5 @@
 CREATE TABLE t2 SELECT * FROM t1;
 create temporary table t3 (a varchar(255), b varchar(255)) engine=myisam;
 insert into t3 select * from t1;
-select SQL_BIG_RESULT * from t3, (select * from t1) as t4;
+select SQL_BIG_RESULT * from t3, (select * from t1) as t4 where t3.a != '';
 ERROR HY000: Global read memory constraint hit; increase read-buffer-threshold

=== modified file 'tests/r/group_by.result'
--- tests/r/group_by.result	2010-08-19 01:24:09 +0000
+++ tests/r/group_by.result	2011-02-07 17:26:32 +0000
@@ -895,7 +895,7 @@
 f1	f2
 select * from t1 group by f1, f2;
 f1	f2
-select t1.f1,t.* from t1, t1 t group by 1;
+select t1.f1,t.* from t1, t1 t where t1.f1 >= 0 group by 1;
 f1	f1	f2
 drop table t1;
 CREATE TABLE t1(

=== modified file 'tests/r/group_min_max.result'
--- tests/r/group_min_max.result	2010-12-02 04:36:22 +0000
+++ tests/r/group_min_max.result	2011-02-07 17:26:32 +0000
@@ -1608,7 +1608,7 @@
 b	c	b	c
 a	d	a	d
 b	d	b	d
-select distinct t1.a1,t2.a1 from t1,t2;
+select distinct t1.a1,t2.a1 from t1,t2 where t1.a1 >= '';
 a1	a1
 a	a
 a	b

=== modified file 'tests/r/insert_select.result'
--- tests/r/insert_select.result	2010-02-15 18:29:31 +0000
+++ tests/r/insert_select.result	2011-02-07 17:26:32 +0000
@@ -130,7 +130,7 @@
 3
 4
 5
-insert into t1 select t2.a from t1,t2;
+insert into t1 select t2.a from t1,t2 where t1.a > 0;
 select * from t1;
 a
 1

=== modified file 'tests/r/join.result'
--- tests/r/join.result	2011-01-05 07:43:57 +0000
+++ tests/r/join.result	2011-02-07 17:26:32 +0000
@@ -4,11 +4,9 @@
 INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (2);
 SELECT * FROM t1 JOIN t2;
-S1	S1
-1	2
+ERROR HY000: Implicit cartesian join attempted.
 SELECT * FROM t1 INNER JOIN t2;
-S1	S1
-1	2
+ERROR HY000: Implicit cartesian join attempted.
 SELECT * from t1 JOIN t2 USING (S1);
 S1
 SELECT * FROM t1 INNER JOIN t2 USING (S1);
@@ -299,7 +297,7 @@
 CREATE TABLE t2 (b int);
 CREATE TABLE t3 (c int);
 SELECT * FROM t1 NATURAL JOIN t2 NATURAL JOIN t3;
-a	b	c
+ERROR HY000: Implicit cartesian join attempted.
 DROP TABLE t1, t2, t3;
 create table t1 (i int);
 create table t2 (i int);
@@ -774,13 +772,13 @@
 create table t2 (a int, b int, filler char(100), key(a), key(b));
 create table t3 (a int, b int, filler char(100), key(a), key(b));
 insert into t2 
-select @a:= A.a + 10*(B.a + 10*C.a), @a, 'filler' from t1 A, t1 B, t1 C;
+select @a:= A.a + 10*(B.a + 10*C.a), @a, 'filler' from t1 A, t1 B, t1 C where B.a >= 0;
 insert into t3 select * from t2 where a < 800;
 drop table t1, t2, t3;
 create table t1 (a int);
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t2 (a int, b int, primary key(a));
-insert into t2 select @v:=A.a+10*B.a, @v  from t1 A, t1 B;
+insert into t2 select @v:=A.a+10*B.a, @v  from t1 A, t1 B where B.a >= 0;
 explain select * from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	10	

=== modified file 'tests/r/join_nested.result'
--- tests/r/join_nested.result	2010-12-02 05:06:19 +0000
+++ tests/r/join_nested.result	2011-02-07 17:26:32 +0000
@@ -37,11 +37,7 @@
 4	2
 SELECT t3.a,t3.b,t4.a,t4.b
 FROM t3,t4;
-a	b	a	b
-1	2	3	2
-1	2	4	2
-2	2	3	2
-2	2	4	2
+ERROR HY000: Implicit cartesian join attempted.
 SELECT t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
 FROM t2
 LEFT JOIN              
@@ -107,19 +103,7 @@
 3	3
 SELECT t3.a,t3.b,t4.a,t4.b,t5.a,t5.b
 FROM t3,t4,t5;
-a	b	a	b	a	b
-1	2	3	2	2	2
-1	2	3	2	3	1
-1	2	3	2	3	3
-1	2	4	2	2	2
-1	2	4	2	3	1
-1	2	4	2	3	3
-2	2	3	2	2	2
-2	2	3	2	3	1
-2	2	3	2	3	3
-2	2	4	2	2	2
-2	2	4	2	3	1
-2	2	4	2	3	3
+ERROR HY000: Implicit cartesian join attempted.
 SELECT t2.a,t2.b,t3.a,t3.b,t4.a,t4.b,t5.a,t5.b
 FROM t2
 LEFT JOIN              
@@ -208,7 +192,7 @@
 1	1
 2	2
 SELECT t6.a,t6.b,t7.a,t7.b
-FROM t6,t7;
+FROM t6 CROSS JOIN t7;
 a	b	a	b
 3	2	1	1
 3	2	2	2
@@ -766,7 +750,7 @@
 2	2	4	2	2	2
 2	2	5	3	NULL	NULL
 SELECT t3.a,t3.b,t4.a,t4.b
-FROM t3,t4;
+FROM t3 CROSS JOIN t4;
 a	b	a	b
 1	2	3	2
 2	2	3	2
@@ -1323,7 +1307,7 @@
 create table t1 (a int);
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t2 (a int, filler char(100), key(a));
-insert into t2 select A.a + 10*B.a, '' from t1 A, t1 B;
+insert into t2 select A.a + 10*B.a, '' from t1 A CROSS JOIN t1 B;
 create table t3 like t2;
 insert into t3 select * from t2;
 explain select * from t1 left join 

=== modified file 'tests/r/key_diff.result'
--- tests/r/key_diff.result	2010-08-21 22:42:44 +0000
+++ tests/r/key_diff.result	2011-02-07 17:26:32 +0000
@@ -6,7 +6,7 @@
 KEY (b)
 );
 INSERT INTO t1 VALUES ('A','B'),('b','A'),('C','c'),('D','E'),('a','a');
-select * from t1,t1 as t2;
+select * from t1 CROSS JOIN t1 as t2;
 a	b	a	b
 A	B	A	B
 A	B	C	c

=== modified file 'tests/r/olap.result'
--- tests/r/olap.result	2008-12-19 21:34:33 +0000
+++ tests/r/olap.result	2011-02-07 17:26:32 +0000
@@ -269,7 +269,7 @@
 i	COUNT(*)
 100	1
 NULL	1
-SELECT t1.i, t2.i, COUNT(*) FROM t1,t2 GROUP BY t1.i,t2.i WITH ROLLUP;
+SELECT t1.i, t2.i, COUNT(*) FROM t1 CROSS JOIN t2 GROUP BY t1.i,t2.i WITH ROLLUP;
 i	i	COUNT(*)
 100	100	1
 100	200	1

=== modified file 'tests/r/order_by.result'
--- tests/r/order_by.result	2010-12-07 09:12:12 +0000
+++ tests/r/order_by.result	2011-02-07 17:26:32 +0000
@@ -1862,11 +1862,11 @@
 ERROR 42S22: Unknown column 'MissingCol' in 'order clause'
 DROP TABLE bug25126;
 CREATE TABLE t1 (a int);
-SELECT p.a AS val, q.a AS val1 FROM t1 p, t1 q ORDER BY val > 1;
+SELECT p.a AS val, q.a AS val1 FROM t1 p CROSS JOIN t1 q ORDER BY val > 1;
 val	val1
-SELECT p.a AS val, q.a AS val FROM t1 p, t1 q ORDER BY val;
+SELECT p.a AS val, q.a AS val FROM t1 p CROSS JOIN t1 q ORDER BY val;
 ERROR 23000: Column 'val' in order clause is ambiguous
-SELECT p.a AS val, q.a AS val FROM t1 p, t1 q ORDER BY val > 1;
+SELECT p.a AS val, q.a AS val FROM t1 p CROSS JOIN t1 q ORDER BY val > 1;
 ERROR 23000: Column 'val' in order clause is ambiguous
 DROP TABLE t1;
 CREATE TABLE t1 (a int);

=== modified file 'tests/r/range.result'
--- tests/r/range.result	2010-12-20 19:20:57 +0000
+++ tests/r/range.result	2011-02-07 17:26:32 +0000
@@ -657,7 +657,7 @@
 filler char(82),
 PRIMARY KEY (pk1,pk2,pk3,pk4)
 );
-insert into t2 select 1, A.a+10*B.a, 432, 44, 'fillerZ' from t1 A, t1 B;
+insert into t2 select 1, A.a+10*B.a, 432, 44, 'fillerZ' from t1 A CROSS JOIN t1 B;
 INSERT INTO t2 VALUES (2621, 2635, 0, 0,'filler'), (2621, 2635, 1, 0,'filler'),
 (2621, 2635, 10, 0,'filler'), (2621, 2635, 11, 0,'filler'),
 (2621, 2635, 14, 0,'filler'), (2621, 2635, 1000015, 0,'filler');
@@ -969,7 +969,7 @@
 insert into t1 values ('a ','');
 insert into t1 values ('a  ', '');
 insert into t1 select concat('a', 1000 + A.a + 10 * (B.a + 10 * C.a)), ''
-  from t3 A, t3 B, t3 C;
+  from t3 A CROSS JOIN t3 B CROSS JOIN t3 C;
 create table t2 (a varchar(10), filler char(200), key(a));
 insert into t2 select * from t1;
 explain select * from t1 where a between 'a' and 'a ';

=== modified file 'tests/r/select.result'
--- tests/r/select.result	2011-01-26 21:05:29 +0000
+++ tests/r/select.result	2011-02-07 17:26:32 +0000
@@ -1266,7 +1266,7 @@
 58	company 8
 65	company 9
 68	company 10
-select * from t1,t1 t12;
+select * from t1 CROSS JOIN t1 t12;
 Period	Varor_period	Period	Varor_period
 9410	9412	9410	9412
 select t2.fld1,t22.fld1 from t2,t2 t22 where t2.fld1 >= 250501 and t2.fld1 <= 250505 and t22.fld1 >= 250501 and t22.fld1 <= 250505;
@@ -2932,7 +2932,7 @@
 create table t1 (a int);
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t2 (a int, b int, c int, e int, primary key(a,b,c));
-insert into t2 select A.a, B.a, C.a, C.a from t1 A, t1 B, t1 C;
+insert into t2 select A.a, B.a, C.a, C.a from t1 A CROSS JOIN t1 B CROSS JOIN t1 C;
 analyze table t2;
 Table	Op	Msg_type	Msg_text
 test.t2	analyze	status	OK
@@ -3555,7 +3555,7 @@
 c34 INT DEFAULT 0,
 KEY (c33, c34, c32));
 INSERT INTO t1 values (),(),(),(),();
-INSERT INTO t2 SELECT a.c11, b.c11 FROM t1 a, t1 b;
+INSERT INTO t2 SELECT a.c11, b.c11 FROM t1 a CROSS JOIN t1 b;
 INSERT INTO t3 VALUES (1, 1, 1, 0), 
 (2, 2, 0, 0), 
 (3, 3, 1, 0), 

=== modified file 'tests/r/select_safe.result'
--- tests/r/select_safe.result	2010-08-09 16:31:29 +0000
+++ tests/r/select_safe.result	2011-02-07 17:26:32 +0000
@@ -13,7 +13,7 @@
 1	test
 2	test2
 update t1 set b="a" where a=1;
-select 1 from t1,t1 as t2,t1 as t3;
+select 1 from t1 CROSS JOIN t1 as t2 CROSS JOIN t1 as t3;
 1
 1
 1
@@ -24,7 +24,7 @@
 delete from t1;
 delete from t1 where b="test";
 delete from t1 where a+0=1;
-select 1 from t1,t1 as t2,t1 as t3,t1 as t4,t1 as t5;
+select 1 from t1 CROSS JOIN t1 as t2 CROSS JOIN t1 as t3 CROSS JOIN t1 as t4 CROSS JOIN t1 as t5;
 1
 update t1 set b="a" limit 1;
 update t1 set b="a" where b="b" limit 2;

=== modified file 'tests/r/status.result'
--- tests/r/status.result	2011-01-18 23:35:32 +0000
+++ tests/r/status.result	2011-02-07 17:26:32 +0000
@@ -80,7 +80,7 @@
 SHOW SESSION STATUS LIKE 'Last_query_cost';
 Variable_name	Value
 Last_query_cost	0
-SELECT * FROM t1 a, t1 b LIMIT 1;
+SELECT * FROM t1 a CROSS JOIN t1 b LIMIT 1;
 a	a
 1	1
 SHOW SESSION STATUS LIKE 'Last_query_cost';

=== modified file 'tests/r/subselect.result'
--- tests/r/subselect.result	2011-02-04 08:47:29 +0000
+++ tests/r/subselect.result	2011-02-07 17:26:32 +0000
@@ -4524,17 +4524,9 @@
 SELECT * FROM t1 JOIN ((t1 t1a)) t1a ON 1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your Drizzle server version for the right syntax to use near 't1a ON 1' at line 1
 SELECT * FROM t1 JOIN  (t1 t1a)  ON 1;
-a	a
-1	1
-1	2
-2	1
-2	2
+ERROR HY000: Implicit cartesian join attempted.
 SELECT * FROM t1 JOIN ((t1 t1a)) ON 1;
-a	a
-1	1
-2	1
-1	2
-2	2
+ERROR HY000: Implicit cartesian join attempted.
 SELECT * FROM (t1 t1a);
 a
 1

=== modified file 'tests/r/subselect3.result'
--- tests/r/subselect3.result	2010-10-25 23:13:58 +0000
+++ tests/r/subselect3.result	2011-02-07 17:26:32 +0000
@@ -247,7 +247,7 @@
 NULL	1	100	0
 NULL	2	100	NULL
 create table t4 (x int);
-insert into t4 select A.a + 10*B.a from t1 A, t1 B;
+insert into t4 select A.a + 10*B.a from t1 A CROSS JOIN t1 B;
 explain extended 
 select a,b, oref, 
 (a,b) in (select a,b from t1,t4 where c=t2.oref) Z 

=== modified file 'tests/r/subselect_sj.result'
--- tests/r/subselect_sj.result	2009-06-16 01:16:01 +0000
+++ tests/r/subselect_sj.result	2011-02-07 17:26:32 +0000
@@ -70,7 +70,7 @@
 0	0	0	0
 1	1	1	1
 2	2	2	2
-insert into t1 select (A.a + 10 * B.a),1 from t0 A, t0 B;
+insert into t1 select (A.a + 10 * B.a),1 from t0 A CROSS JOIN t0 B;
 explain extended select * from t1 where a in (select pk from t10 where pk<3);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	103	100.00	Using where

=== modified file 'tests/r/subselect_sj2.result'
--- tests/r/subselect_sj2.result	2009-10-20 20:39:01 +0000
+++ tests/r/subselect_sj2.result	2011-02-07 17:26:32 +0000
@@ -353,7 +353,7 @@
 c1
 2009-10-22
 2142-10-22
-explain select 1 from t2 where  c2 in (select 1 from t3, t2) and  c1 in (select convert(c6,char(1)) from t2);
+explain select 1 from t2 where  c2 in (select 1 from t3 CROSS JOIN t2) and  c1 in (select convert(c6,char(1)) from t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	1	Using where
 3	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	1	

=== modified file 'tests/r/sum_distinct.result'
--- tests/r/sum_distinct.result	2010-04-20 18:23:07 +0000
+++ tests/r/sum_distinct.result	2011-02-07 17:26:32 +0000
@@ -47,7 +47,7 @@
 SUM(DISTINCT LENGTH(g1.name)) s1,
 SUM(DISTINCT SUBSTRING(g2.name, 1, 3)) s2,
 SUM(DISTINCT LENGTH(SUBSTRING(g3.name, 1, 4))) s3
-FROM t1 g1, t1 g2, t1 g3;
+FROM t1 g1 CROSS JOIN t1 g2 CROSS JOIN t1 g3;
 s1	s2	s3
 42	0	7
 SELECT
@@ -55,7 +55,7 @@
 SUM(DISTINCT LENGTH(g1.name)) s1,
 SUM(DISTINCT SUBSTRING(g2.name, 1, 3)) s2,
 SUM(DISTINCT LENGTH(SUBSTRING(g3.name, 1, 4))) s3
-FROM t1 g1, t1 g2, t1 g3 GROUP BY LENGTH(SUBSTRING(g3.name, 5, 10));
+FROM t1 g1 CROSS JOIN t1 g2 CROSS JOIN t1 g3 GROUP BY LENGTH(SUBSTRING(g3.name, 5, 10));
 s1	s2	s3
 42	0	NULL
 42	0	7
@@ -75,7 +75,7 @@
 SUM(DISTINCT LENGTH(g1.name)) s1,
 SUM(DISTINCT SUBSTRING(g2.name, 1, 3)) s2,
 SUM(DISTINCT LENGTH(SUBSTRING(g3.name, 1, 4))) s3
-FROM t1 g1, t1 g2, t1 g3 GROUP BY LENGTH(SUBSTRING(g3.name, 5, 10));
+FROM t1 g1 CROSS JOIN t1 g2 CROSS JOIN t1 g3 GROUP BY LENGTH(SUBSTRING(g3.name, 5, 10));
 s1	s2	s3
 42	0	NULL
 42	0	7

=== modified file 'tests/r/type_blob.result'
--- tests/r/type_blob.result	2010-09-10 10:05:56 +0000
+++ tests/r/type_blob.result	2011-02-07 17:26:32 +0000
@@ -43,7 +43,7 @@
 select last_insert_id();
 last_insert_id()
 3
-select * from t1,t1 as t2;
+select * from t1 CROSS JOIN t1 as t2;
 nr	b	str	nr	b	str
 1	a	A	1	a	A
 1	a	A	2	bbb	BBB

=== modified file 'tests/r/type_date.result'
--- tests/r/type_date.result	2011-01-26 21:05:29 +0000
+++ tests/r/type_date.result	2011-02-07 17:26:32 +0000
@@ -65,11 +65,11 @@
 INSERT INTO t1 VALUES(1);
 CREATE TABLE t2(GMT  VARCHAR(32));
 INSERT INTO t2 VALUES('GMT-0800');
-SELECT DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)) FROM t1, t2 GROUP BY t1.AFIELD;
+SELECT DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)) FROM t1 CROSS JOIN t2 GROUP BY t1.AFIELD;
 DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT))
 Wed, 06 March 2002 10:11:12 GMT-0800
 INSERT INTO t1 VALUES(1);
-SELECT DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)), DATE_FORMAT("2002-03-06 10:11:12",  CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)) FROM t1,t2 GROUP BY t1.AFIELD;
+SELECT DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)), DATE_FORMAT("2002-03-06 10:11:12",  CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)) FROM t1 CROSS JOIN t2 GROUP BY t1.AFIELD;
 DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT))	DATE_FORMAT("2002-03-06 10:11:12",  CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT))
 Wed, 06 March 2002 10:11:12 GMT-0800	Wed, 06 March 2002 10:11:12 GMT-0800
 drop table t1,t2;

=== modified file 'tests/r/type_float.result'
--- tests/r/type_float.result	2010-09-02 18:35:05 +0000
+++ tests/r/type_float.result	2011-02-07 17:26:32 +0000
@@ -219,7 +219,7 @@
 desc t2;
 Field	Type	Null	Default	Default_is_NULL	On_Update
 y	DECIMAL	NO		NO	
-create table t3 select x+y a from t1,t2;
+create table t3 select x+y a from t1 CROSS JOIN t2;
 show warnings;
 Level	Code	Message
 desc t3;

=== modified file 'tests/r/type_ranges.result'
--- tests/r/type_ranges.result	2010-09-10 10:05:56 +0000
+++ tests/r/type_ranges.result	2011-02-07 17:26:32 +0000
@@ -206,7 +206,7 @@
 create table t2 select * from t1;
 create table t3 select * from t1, t2;
 ERROR 42S21: Duplicate column name 'c'
-create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1, t2;
+create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1 CROSS JOIN t2;
 show columns from t3;
 Field	Type	Null	Default	Default_is_NULL	On_Update
 c1	INTEGER	YES		YES	

=== modified file 'tests/r/union.result'
--- tests/r/union.result	2011-02-04 08:47:29 +0000
+++ tests/r/union.result	2011-02-07 17:26:32 +0000
@@ -515,7 +515,7 @@
 insert into t2 (group_name) values ('Group A');
 insert into t2 (group_name) values ('Group B');
 insert into t3 (user_id, group_id) values (1,1);
-select 1 'is_in_group', a.user_name, c.group_name, b.id from t1 a, t3 b, t2 c where a.id = b.user_id and b.group_id = c.id UNION  select 0 'is_in_group', a.user_name, c.group_name, null from t1 a, t2 c;
+select 1 'is_in_group', a.user_name, c.group_name, b.id from t1 a, t3 b, t2 c where a.id = b.user_id and b.group_id = c.id UNION  select 0 'is_in_group', a.user_name, c.group_name, null from t1 a CROSS JOIN t2 c;
 is_in_group	user_name	group_name	id
 1	Tester	Group A	1
 0	Tester	Group A	NULL

=== modified file 'tests/r/update.result'
--- tests/r/update.result	2011-01-05 07:43:57 +0000
+++ tests/r/update.result	2011-02-07 17:26:32 +0000
@@ -277,7 +277,7 @@
 create table t1 (a int);
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t2 (a int, filler1 char(200), filler2 char(200), key(a));
-insert into t2 select A.a + 10*B.a, 'filler','filler' from t1 A, t1 B;
+insert into t2 select A.a + 10*B.a, 'filler','filler' from t1 A CROSS JOIN t1 B;
 flush status;
 update t2 set a=3 where a=2;
 show status like 'handler_read%';

=== modified file 'tests/suite/jp/r/join_utf8.result'
--- tests/suite/jp/r/join_utf8.result	2010-10-25 03:09:38 +0000
+++ tests/suite/jp/r/join_utf8.result	2011-02-07 17:26:32 +0000
@@ -42,16 +42,6 @@
 INSERT INTO `Ｔ８a` VALUES ('あ'),('か'),('さ');
 INSERT INTO `Ｔ８b` VALUES ('あ');
 INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗');
-SELECT * FROM `Ｔ１a` JOIN `Ｔ１b`;
-Ｃ１	Ｃ１
-ｱ	ｱ
-ｶ	ｱ
-ｻ	ｱ
-SELECT * FROM `Ｔ１a` INNER JOIN `Ｔ１b`;
-Ｃ１	Ｃ１
-ｱ	ｱ
-ｶ	ｱ
-ｻ	ｱ
 SELECT * FROM `Ｔ１a` JOIN `Ｔ１b` USING (`Ｃ１`);
 Ｃ１
 ｱ
@@ -83,16 +73,6 @@
 ｱ	ｱ
 NULL	ｶ
 NULL	ｻ
-SELECT * FROM `Ｔ２a` JOIN `Ｔ２b`;
-Ｃ１	Ｃ１
-あ	あ
-か	あ
-さ	あ
-SELECT * FROM `Ｔ２a` INNER JOIN `Ｔ２b`;
-Ｃ１	Ｃ１
-あ	あ
-か	あ
-さ	あ
 SELECT * FROM `Ｔ２a` JOIN `Ｔ２b` USING (`Ｃ１`);
 Ｃ１
 あ
@@ -124,16 +104,6 @@
 あ	あ
 NULL	か
 NULL	さ
-SELECT * FROM `Ｔ３a` JOIN `Ｔ３b`;
-Ｃ１	Ｃ１
-龔	龔
-龖	龔
-龗	龔
-SELECT * FROM `Ｔ３a` INNER JOIN `Ｔ３b`;
-Ｃ１	Ｃ１
-龔	龔
-龖	龔
-龗	龔
 SELECT * FROM `Ｔ３a` JOIN `Ｔ３b` USING (`Ｃ１`);
 Ｃ１
 龔

=== modified file 'tests/suite/jp/t/join_utf8.test'
--- tests/suite/jp/t/join_utf8.test	2010-10-25 03:09:38 +0000
+++ tests/suite/jp/t/join_utf8.test	2011-02-07 17:26:32 +0000
@@ -57,8 +57,6 @@
 INSERT INTO `Ｔ９a` VALUES ('龔'),('龖'),('龗');
 
 #Test for innodb
-SELECT * FROM `Ｔ１a` JOIN `Ｔ１b`;
-SELECT * FROM `Ｔ１a` INNER JOIN `Ｔ１b`;
 SELECT * FROM `Ｔ１a` JOIN `Ｔ１b` USING (`Ｃ１`);
 SELECT * FROM `Ｔ１a` INNER JOIN `Ｔ１b` USING (`Ｃ１`);
 SELECT * FROM `Ｔ１a` CROSS JOIN `Ｔ１b`;
@@ -66,8 +64,6 @@
 SELECT * FROM `Ｔ１a` LEFT JOIN `Ｔ１b` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`);
 SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` USING (`Ｃ１`);
 SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`);
-SELECT * FROM `Ｔ２a` JOIN `Ｔ２b`;
-SELECT * FROM `Ｔ２a` INNER JOIN `Ｔ２b`;
 SELECT * FROM `Ｔ２a` JOIN `Ｔ２b` USING (`Ｃ１`);
 SELECT * FROM `Ｔ２a` INNER JOIN `Ｔ２b` USING (`Ｃ１`);
 SELECT * FROM `Ｔ２a` CROSS JOIN `Ｔ２b`;
@@ -75,8 +71,6 @@
 SELECT * FROM `Ｔ２a` LEFT JOIN `Ｔ２b` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`);
 SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` USING (`Ｃ１`);
 SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`);
-SELECT * FROM `Ｔ３a` JOIN `Ｔ３b`;
-SELECT * FROM `Ｔ３a` INNER JOIN `Ｔ３b`;
 SELECT * FROM `Ｔ３a` JOIN `Ｔ３b` USING (`Ｃ１`);
 SELECT * FROM `Ｔ３a` INNER JOIN `Ｔ３b` USING (`Ｃ１`);
 SELECT * FROM `Ｔ３a` CROSS JOIN `Ｔ３b`;

=== modified file 'tests/t/derived.test'
--- tests/t/derived.test	2011-01-26 00:31:58 +0000
+++ tests/t/derived.test	2011-02-07 17:26:32 +0000
@@ -28,8 +28,8 @@
 --error ER_BAD_FIELD_ERROR
 SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1  HAVING a=1) as a;
 --sort_result
-select * from t1 as x1, (select * from t1) as x2;
-explain select * from t1 as x1, (select * from t1) as x2;
+select * from t1 as x1, (select * from t1) as x2 where x1.a != 0;
+explain select * from t1 as x1, (select * from t1) as x2 where x1.a != 0;
 drop table if exists  t2,t3;
 select * from (select 1) as a;
 select a from (select 1 as a) as b;
@@ -58,7 +58,7 @@
 enable_query_log;
 SELECT * FROM (SELECT * FROM t1) as b ORDER BY a  ASC LIMIT 0,20;
 --replace_column 9 X
-explain select count(*) from t1 as tt1, (select * from t1) as tt2;
+explain select count(*) from t1 as tt1, (select * from t1) as tt2 where tt1.a != 0;
 drop table t1;
 SELECT * FROM (SELECT (SELECT * FROM (SELECT 1 as a) as a )) as b;
 select * from (select 1 as a) b  left join (select 2 as a) c using(a);
@@ -125,8 +125,8 @@
 create table t1 (a int);
 insert into t1 values (1),(2);
 --sort_result
-select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b;
-explain select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b;
+select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b where a.a != 0;
+explain select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b where a.a != 0;
 drop table t1;
 
 #
@@ -221,7 +221,7 @@
 #
 create table t1 (a int);
 create table t2 (a int);
-select * from (select * from t1,t2) foo;
+select * from (select * from t1,t2 where t1.a != 0) foo;
 drop table t1,t2;
 
 #

=== modified file 'tests/t/distinct.test'
--- tests/t/distinct.test	2010-08-21 22:42:44 +0000
+++ tests/t/distinct.test	2011-02-07 17:26:32 +0000
@@ -345,6 +345,7 @@
 INSERT INTO t1 VALUES (1,1), (2,1), (3,1);
 EXPLAIN SELECT DISTINCT a FROM t1;
 EXPLAIN SELECT DISTINCT a,b FROM t1;
+--error ER_CARTESIAN_JOIN_ATTEMPTED
 EXPLAIN SELECT DISTINCT t1_1.a, t1_1.b FROM t1 t1_1, t1 t1_2;
 --sorted_result
 EXPLAIN SELECT DISTINCT t1_1.a, t1_1.b FROM t1 t1_1, t1 t1_2

=== modified file 'tests/t/func_gconcat.test'
--- tests/t/func_gconcat.test	2010-08-26 21:56:15 +0000
+++ tests/t/func_gconcat.test	2011-02-07 17:26:32 +0000
@@ -104,7 +104,7 @@
 create table t1(id int);
 create table t2(id int);
 insert into t1 values(0),(1);
-select group_concat(t1.id) FROM t1,t2;
+select group_concat(t1.id) FROM t1,t2 where t2.id < 2;
 drop table t1;
 drop table t2;
 
@@ -190,7 +190,7 @@
 CREATE TABLE t2 ( a int );
 INSERT INTO t1 VALUES (1), (2);
 INSERT INTO t2 VALUES (1), (2);
-SELECT GROUP_CONCAT(t1.a*t2.a ORDER BY t2.a) FROM t1, t2 GROUP BY t1.a;
+SELECT GROUP_CONCAT(t1.a*t2.a ORDER BY t2.a) FROM t1, t2 WHERE t1.a < 3 GROUP BY t1.a;
 DROP TABLE t1, t2;
 
 #
@@ -602,6 +602,7 @@
  FROM
   t1 AS t1,
   t1 AS t2
+ WHERE t2.a IS NULL
  GROUP BY 1
 ) AS s1;
 DROP TABLE t1;

=== modified file 'tests/t/func_group.test'
--- tests/t/func_group.test	2010-08-23 19:49:47 +0000
+++ tests/t/func_group.test	2011-02-07 17:26:32 +0000
@@ -120,7 +120,7 @@
 # The following returned NULL in 4.0.10
 select min(a2) from t1;
 select max(t1.a1), max(t2.a2) from t1, t2;
-select max(t1.a1) from t1, t2;
+select max(t1.a1) from t1, t2 where t1.a1 > 0;
 select max(t2.a2), max(t1.a1) from t1, t2;
 
 explain select min(a2) from t1;
@@ -129,7 +129,7 @@
 insert into t2 values('AAA', 10, 0.5);
 insert into t2 values('BBB', 20, 1.0);
 --sorted_result
-select t1.a1, t1.a2, t2.a1, t2.a2 from t1,t2;
+select t1.a1, t1.a2, t2.a1, t2.a2 from t1,t2 where t1.a1 > 0;
 
 select max(t1.a1), max(t2.a1) from t1, t2 where t2.a2=9;
 select max(t2.a1), max(t1.a1) from t1, t2 where t2.a2=9;

=== modified file 'tests/t/func_in.test'
--- tests/t/func_in.test	2010-12-20 19:20:57 +0000
+++ tests/t/func_in.test	2011-02-07 17:26:32 +0000
@@ -142,7 +142,7 @@
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); 
 create temporary table t2 (a int, filler char(200), key(a)) engine=myisam;
 
-insert into t2 select C.a*2,   'no'  from t1 A, t1 B, t1 C;
+insert into t2 select C.a*2,   'no'  from t1 A, t1 B, t1 C where A.a < 10;
 insert into t2 select C.a*2+1, 'yes' from t1 C;
 
 explain 
@@ -180,9 +180,9 @@
 #
 create table t2 (a varchar(10), filler char(200), key(a));
 
-insert into t2 select 'foo', 'no' from t1 A, t1 B;
-insert into t2 select 'barbar', 'no' from t1 A, t1 B;
-insert into t2 select 'bazbazbaz', 'no' from t1 A, t1 B;
+insert into t2 select 'foo', 'no' from t1 A, t1 B where A.a < 10;
+insert into t2 select 'barbar', 'no' from t1 A, t1 B where A.a < 10;
+insert into t2 select 'bazbazbaz', 'no' from t1 A, t1 B where A.a < 10;
 
 insert into t2 values ('fon', '1'), ('fop','1'), ('barbaq','1'), 
   ('barbas','1'), ('bazbazbay', '1'),('zz','1');
@@ -196,9 +196,9 @@
 #
 create table t2 (a decimal(10,5), filler char(200), key(a));
 
-insert into t2 select 345.67890, 'no' from t1 A, t1 B;
-insert into t2 select 43245.34, 'no' from t1 A, t1 B;
-insert into t2 select 64224.56344, 'no' from t1 A, t1 B;
+insert into t2 select 345.67890, 'no' from t1 A, t1 B where A.a < 10;
+insert into t2 select 43245.34, 'no' from t1 A, t1 B where A.a < 10;
+insert into t2 select 64224.56344, 'no' from t1 A, t1 B where A.a < 10;
 
 insert into t2 values (0, '1'), (22334.123,'1'), (33333,'1'), 
   (55555,'1'), (77777, '1');
@@ -217,7 +217,7 @@
 set @str="update t2 set b=1 where a not in (";
 select count(*) from (
   select @str:=concat(@str, @cnt:=@cnt+1, ",") 
-  from t1 A, t1 B, t1 C, t1 D) Z;
+  from t1 A, t1 B, t1 C, t1 D  where A.a < 10) Z;
 
 set @str:=concat(@str, "10000)");
 select substr(@str, 1, 50);

=== modified file 'tests/t/global_read_constraints.test'
--- tests/t/global_read_constraints.test	2011-01-24 04:22:18 +0000
+++ tests/t/global_read_constraints.test	2011-02-07 17:26:32 +0000
@@ -6,4 +6,4 @@
 create temporary table t3 (a varchar(255), b varchar(255)) engine=myisam;
 insert into t3 select * from t1;
 --error ER_OUT_OF_GLOBAL_READMEMORY
-select SQL_BIG_RESULT * from t3, (select * from t1) as t4;
+select SQL_BIG_RESULT * from t3, (select * from t1) as t4 where t3.a != '';

=== modified file 'tests/t/group_by.test'
--- tests/t/group_by.test	2011-01-26 00:31:58 +0000
+++ tests/t/group_by.test	2011-02-07 17:26:32 +0000
@@ -750,7 +750,7 @@
 select * from t1 group by f1;
 select * from t1 group by f2;
 select * from t1 group by f1, f2;
-select t1.f1,t.* from t1, t1 t group by 1;
+select t1.f1,t.* from t1, t1 t where t1.f1 >= 0 group by 1;
 drop table t1;
 
 #

=== modified file 'tests/t/group_min_max.test'
--- tests/t/group_min_max.test	2010-08-21 22:42:44 +0000
+++ tests/t/group_min_max.test	2011-02-07 17:26:32 +0000
@@ -524,7 +524,7 @@
 select distinct a1,a1 from t1;
 select distinct a2,a1,a2,a1 from t1;
 --sorted_result
-select distinct t1.a1,t2.a1 from t1,t2;
+select distinct t1.a1,t2.a1 from t1,t2 where t1.a1 >= '';
 
 
 #

=== modified file 'tests/t/insert_select.test'
--- tests/t/insert_select.test	2010-08-26 21:56:15 +0000
+++ tests/t/insert_select.test	2011-02-07 17:26:32 +0000
@@ -87,7 +87,7 @@
 select * from t1;
 insert into t2 select * from t1 as t2;
 select * from t1;
-insert into t1 select t2.a from t1,t2;
+insert into t1 select t2.a from t1,t2 where t1.a > 0;
 select * from t1;
 --error ER_NONUNIQ_TABLE
 insert into t1 select * from t1,t1;

=== modified file 'tests/t/join.test'
--- tests/t/join.test	2011-01-26 00:31:58 +0000
+++ tests/t/join.test	2011-02-07 17:26:32 +0000
@@ -12,7 +12,9 @@
 CREATE TABLE t2 (S1 INT);
 INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (2);
+--error ER_CARTESIAN_JOIN_ATTEMPTED
 SELECT * FROM t1 JOIN t2;
+--error ER_CARTESIAN_JOIN_ATTEMPTED
 SELECT * FROM t1 INNER JOIN t2;
 SELECT * from t1 JOIN t2 USING (S1);
 SELECT * FROM t1 INNER JOIN t2 USING (S1);
@@ -299,6 +301,7 @@
 CREATE TABLE t1 (a int);
 CREATE TABLE t2 (b int);
 CREATE TABLE t3 (c int);
+--error ER_CARTESIAN_JOIN_ATTEMPTED
 SELECT * FROM t1 NATURAL JOIN t2 NATURAL JOIN t3;
 DROP TABLE t1, t2, t3;
 
@@ -598,7 +601,7 @@
 create table t3 (a int, b int, filler char(100), key(a), key(b));
 
 insert into t2 
-  select @a:= A.a + 10*(B.a + 10*C.a), @a, 'filler' from t1 A, t1 B, t1 C;
+  select @a:= A.a + 10*(B.a + 10*C.a), @a, 'filler' from t1 A, t1 B, t1 C where B.a >= 0;
 insert into t3 select * from t2 where a < 800;
 
 # The order of tables must be t2,t3:
@@ -612,7 +615,7 @@
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 
 create table t2 (a int, b int, primary key(a));
-insert into t2 select @v:=A.a+10*B.a, @v  from t1 A, t1 B;
+insert into t2 select @v:=A.a+10*B.a, @v  from t1 A, t1 B where B.a >= 0;
 
 explain select * from t1;
 --replace_column 2 #

=== modified file 'tests/t/join_nested.test'
--- tests/t/join_nested.test	2010-08-21 22:42:44 +0000
+++ tests/t/join_nested.test	2011-02-07 17:26:32 +0000
@@ -35,7 +35,7 @@
 SELECT t4.a,t4.b
   FROM t4;
 
---sorted_result
+--error ER_CARTESIAN_JOIN_ATTEMPTED
 SELECT t3.a,t3.b,t4.a,t4.b
   FROM t3,t4;
 
@@ -76,7 +76,7 @@
 SELECT t5.a,t5.b
   FROM t5;
 
---sorted_result
+--error ER_CARTESIAN_JOIN_ATTEMPTED
 SELECT t3.a,t3.b,t4.a,t4.b,t5.a,t5.b
   FROM t3,t4,t5;
 
@@ -126,7 +126,7 @@
 
 --sorted_result
 SELECT t6.a,t6.b,t7.a,t7.b
-  FROM t6,t7;
+  FROM t6 CROSS JOIN t7;
 
 SELECT t8.a,t8.b
   FROM t8;
@@ -426,7 +426,7 @@
     WHERE t1.a <= 2;
 
 SELECT t3.a,t3.b,t4.a,t4.b
-  FROM t3,t4;
+  FROM t3 CROSS JOIN t4;
 
 SELECT t2.a,t2.b,t3.a,t3.b,t4.a,t4.b
   FROM t2 
@@ -771,7 +771,7 @@
 create table t1 (a int);
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t2 (a int, filler char(100), key(a));
-insert into t2 select A.a + 10*B.a, '' from t1 A, t1 B;
+insert into t2 select A.a + 10*B.a, '' from t1 A CROSS JOIN t1 B;
 create table t3 like t2;
 insert into t3 select * from t2;
 

=== modified file 'tests/t/key_diff.test'
--- tests/t/key_diff.test	2010-08-21 22:42:44 +0000
+++ tests/t/key_diff.test	2011-02-07 17:26:32 +0000
@@ -15,7 +15,7 @@
 INSERT INTO t1 VALUES ('A','B'),('b','A'),('C','c'),('D','E'),('a','a');
 
 --sorted_result
-select * from t1,t1 as t2;
+select * from t1 CROSS JOIN t1 as t2;
 explain select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B;
 #select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B;
 select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B order by binary t1.a,t2.a;

=== modified file 'tests/t/olap.test'
--- tests/t/olap.test	2010-08-26 21:56:15 +0000
+++ tests/t/olap.test	2011-02-07 17:26:32 +0000
@@ -90,7 +90,7 @@
 CREATE TABLE t2 (i int);
 INSERT INTO t2 VALUES (100),(200);
 SELECT i, COUNT(*) FROM t1 GROUP BY i WITH ROLLUP;
-SELECT t1.i, t2.i, COUNT(*) FROM t1,t2 GROUP BY t1.i,t2.i WITH ROLLUP;
+SELECT t1.i, t2.i, COUNT(*) FROM t1 CROSS JOIN t2 GROUP BY t1.i,t2.i WITH ROLLUP;
 drop table t1,t2;
 
 #bug #4767: ROLLUP with LEFT JOIN 

=== modified file 'tests/t/order_by.test'
--- tests/t/order_by.test	2010-12-07 09:12:12 +0000
+++ tests/t/order_by.test	2011-02-07 17:26:32 +0000
@@ -623,11 +623,11 @@
 
 CREATE TABLE t1 (a int);
 
-SELECT p.a AS val, q.a AS val1 FROM t1 p, t1 q ORDER BY val > 1;
---error ER_NON_UNIQ_ERROR
-SELECT p.a AS val, q.a AS val FROM t1 p, t1 q ORDER BY val;
---error ER_NON_UNIQ_ERROR
-SELECT p.a AS val, q.a AS val FROM t1 p, t1 q ORDER BY val > 1;
+SELECT p.a AS val, q.a AS val1 FROM t1 p CROSS JOIN t1 q ORDER BY val > 1;
+--error ER_NON_UNIQ_ERROR
+SELECT p.a AS val, q.a AS val FROM t1 p CROSS JOIN t1 q ORDER BY val;
+--error ER_NON_UNIQ_ERROR
+SELECT p.a AS val, q.a AS val FROM t1 p CROSS JOIN t1 q ORDER BY val > 1;
 
 DROP TABLE t1;
 

=== modified file 'tests/t/range.test'
--- tests/t/range.test	2010-12-20 19:20:57 +0000
+++ tests/t/range.test	2011-02-07 17:26:32 +0000
@@ -508,7 +508,7 @@
   PRIMARY KEY (pk1,pk2,pk3,pk4)
 );
 
-insert into t2 select 1, A.a+10*B.a, 432, 44, 'fillerZ' from t1 A, t1 B;
+insert into t2 select 1, A.a+10*B.a, 432, 44, 'fillerZ' from t1 A CROSS JOIN t1 B;
 INSERT INTO t2 VALUES (2621, 2635, 0, 0,'filler'), (2621, 2635, 1, 0,'filler'),
   (2621, 2635, 10, 0,'filler'), (2621, 2635, 11, 0,'filler'),
   (2621, 2635, 14, 0,'filler'), (2621, 2635, 1000015, 0,'filler');
@@ -792,7 +792,7 @@
 insert into t1 values ('a ','');
 insert into t1 values ('a  ', '');
 insert into t1 select concat('a', 1000 + A.a + 10 * (B.a + 10 * C.a)), ''
-  from t3 A, t3 B, t3 C;
+  from t3 A CROSS JOIN t3 B CROSS JOIN t3 C;
 
 create table t2 (a varchar(10), filler char(200), key(a));
 insert into t2 select * from t1;

=== modified file 'tests/t/select.test'
--- tests/t/select.test	2011-02-01 18:23:24 +0000
+++ tests/t/select.test	2011-02-07 17:26:32 +0000
@@ -1534,7 +1534,7 @@
 # Full join (same alias)
 #
 
-select * from t1,t1 t12;
+select * from t1 CROSS JOIN t1 t12;
 --sorted_result
 select t2.fld1,t22.fld1 from t2,t2 t22 where t2.fld1 >= 250501 and t2.fld1 <= 250505 and t22.fld1 >= 250501 and t22.fld1 <= 250505;
 
@@ -2720,7 +2720,7 @@
 create table t1 (a int);
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t2 (a int, b int, c int, e int, primary key(a,b,c));
-insert into t2 select A.a, B.a, C.a, C.a from t1 A, t1 B, t1 C;
+insert into t2 select A.a, B.a, C.a, C.a from t1 A CROSS JOIN t1 B CROSS JOIN t1 C;
 analyze table t2;
 select 'In next EXPLAIN, B.rows must be exactly 10:' Z;
 
@@ -3278,7 +3278,7 @@
                  KEY (c33, c34, c32));
 
 INSERT INTO t1 values (),(),(),(),();
-INSERT INTO t2 SELECT a.c11, b.c11 FROM t1 a, t1 b;
+INSERT INTO t2 SELECT a.c11, b.c11 FROM t1 a CROSS JOIN t1 b;
 INSERT INTO t3 VALUES (1, 1, 1, 0), 
                       (2, 2, 0, 0), 
                       (3, 3, 1, 0), 

=== modified file 'tests/t/select_safe.test'
--- tests/t/select_safe.test	2010-08-26 21:56:15 +0000
+++ tests/t/select_safe.test	2011-02-07 17:26:32 +0000
@@ -17,7 +17,7 @@
 --sorted_result
 SELECT SQL_BUFFER_RESULT * from t1;
 update t1 set b="a" where a=1;
-select 1 from t1,t1 as t2,t1 as t3;
+select 1 from t1 CROSS JOIN t1 as t2 CROSS JOIN t1 as t3;
 
 # The following should NOT give errors:
 update t1 set b="a";
@@ -25,7 +25,7 @@
 delete from t1;
 delete from t1 where b="test";
 delete from t1 where a+0=1;
-select 1 from t1,t1 as t2,t1 as t3,t1 as t4,t1 as t5;
+select 1 from t1 CROSS JOIN t1 as t2 CROSS JOIN t1 as t3 CROSS JOIN t1 as t4 CROSS JOIN t1 as t5;
 
 # The following should be ok:
 update t1 set b="a" limit 1;

=== modified file 'tests/t/status.test'
--- tests/t/status.test	2011-01-18 23:35:32 +0000
+++ tests/t/status.test	2011-02-07 17:26:32 +0000
@@ -115,7 +115,7 @@
 SELECT (SELECT a FROM t1 LIMIT 1) x FROM t1 LIMIT 1;
 SHOW SESSION STATUS LIKE 'Last_query_cost';
 
-SELECT * FROM t1 a, t1 b LIMIT 1;
+SELECT * FROM t1 a CROSS JOIN t1 b LIMIT 1;
 SHOW SESSION STATUS LIKE 'Last_query_cost';
 
 DROP TABLE t1;

=== modified file 'tests/t/subselect.test'
--- tests/t/subselect.test	2011-02-04 04:21:02 +0000
+++ tests/t/subselect.test	2011-02-07 17:26:32 +0000
@@ -3119,8 +3119,9 @@
 --error ER_PARSE_ERROR
 SELECT * FROM t1 JOIN ((t1 t1a)) t1a ON 1;
 
---sorted_result
+--error ER_CARTESIAN_JOIN_ATTEMPTED
 SELECT * FROM t1 JOIN  (t1 t1a)  ON 1;
+--error ER_CARTESIAN_JOIN_ATTEMPTED
 SELECT * FROM t1 JOIN ((t1 t1a)) ON 1;
 
 SELECT * FROM (t1 t1a);

=== modified file 'tests/t/subselect3.test'
--- tests/t/subselect3.test	2010-12-21 02:58:40 +0000
+++ tests/t/subselect3.test	2011-02-07 17:26:32 +0000
@@ -225,7 +225,7 @@
 
 # Then check that we do turn off 'ref' scans in the subquery
 create table t4 (x int);
-insert into t4 select A.a + 10*B.a from t1 A, t1 B;
+insert into t4 select A.a + 10*B.a from t1 A CROSS JOIN t1 B;
 explain extended 
   select a,b, oref, 
          (a,b) in (select a,b from t1,t4 where c=t2.oref) Z 

=== modified file 'tests/t/subselect_sj.test'
--- tests/t/subselect_sj.test	2009-06-16 01:16:01 +0000
+++ tests/t/subselect_sj.test	2011-02-07 17:26:32 +0000
@@ -81,7 +81,7 @@
 where t1.a < 5;
 
 # Try I2O orders
-insert into t1 select (A.a + 10 * B.a),1 from t0 A, t0 B;
+insert into t1 select (A.a + 10 * B.a),1 from t0 A CROSS JOIN t0 B;
 explain extended select * from t1 where a in (select pk from t10 where pk<3);
 
 drop table t0, t1;

=== modified file 'tests/t/subselect_sj2.test'
--- tests/t/subselect_sj2.test	2009-10-20 20:39:01 +0000
+++ tests/t/subselect_sj2.test	2011-02-07 17:26:32 +0000
@@ -371,7 +371,7 @@
 insert into t3 values ('2009-10-22'),('2142-10-22');
 create table t2 (c1 tinytext,c2 text,c6 timestamp) engine=innodb;
 select * from t3;
-explain select 1 from t2 where  c2 in (select 1 from t3, t2) and  c1 in (select convert(c6,char(1)) from t2); 
+explain select 1 from t2 where  c2 in (select 1 from t3 CROSS JOIN t2) and  c1 in (select convert(c6,char(1)) from t2); 
 drop table t2, t3;
 
 #

=== modified file 'tests/t/sum_distinct.test'
--- tests/t/sum_distinct.test	2010-04-20 18:23:07 +0000
+++ tests/t/sum_distinct.test	2011-02-07 17:26:32 +0000
@@ -56,14 +56,14 @@
   SUM(DISTINCT LENGTH(g1.name)) s1,
   SUM(DISTINCT SUBSTRING(g2.name, 1, 3)) s2,
   SUM(DISTINCT LENGTH(SUBSTRING(g3.name, 1, 4))) s3
-FROM t1 g1, t1 g2, t1 g3;
+FROM t1 g1 CROSS JOIN t1 g2 CROSS JOIN t1 g3;
 
 SELECT
   SQL_BIG_RESULT
   SUM(DISTINCT LENGTH(g1.name)) s1,
   SUM(DISTINCT SUBSTRING(g2.name, 1, 3)) s2,
   SUM(DISTINCT LENGTH(SUBSTRING(g3.name, 1, 4))) s3
-FROM t1 g1, t1 g2, t1 g3 GROUP BY LENGTH(SUBSTRING(g3.name, 5, 10));
+FROM t1 g1 CROSS JOIN t1 g2 CROSS JOIN t1 g3 GROUP BY LENGTH(SUBSTRING(g3.name, 5, 10));
 
 # here we explicitly request summing through temporary table (so
 # Item_sum_sum_distinct::copy_or_same() is called)
@@ -78,7 +78,7 @@
   SUM(DISTINCT LENGTH(g1.name)) s1,
   SUM(DISTINCT SUBSTRING(g2.name, 1, 3)) s2,
   SUM(DISTINCT LENGTH(SUBSTRING(g3.name, 1, 4))) s3
-FROM t1 g1, t1 g2, t1 g3 GROUP BY LENGTH(SUBSTRING(g3.name, 5, 10));
+FROM t1 g1 CROSS JOIN t1 g2 CROSS JOIN t1 g3 GROUP BY LENGTH(SUBSTRING(g3.name, 5, 10));
 
 # this test demonstrates that strings are automatically converted to numbers
 # before summing

=== modified file 'tests/t/type_blob.test'
--- tests/t/type_blob.test	2011-02-01 18:23:24 +0000
+++ tests/t/type_blob.test	2011-02-07 17:26:32 +0000
@@ -55,7 +55,7 @@
 insert into t1 values (null,"ccc","CCC");
 select last_insert_id();
 --sorted_result
-select * from t1,t1 as t2;
+select * from t1 CROSS JOIN t1 as t2;
 
 drop table t1;
 

=== modified file 'tests/t/type_date.test'
--- tests/t/type_date.test	2011-01-26 21:05:29 +0000
+++ tests/t/type_date.test	2011-02-07 17:26:32 +0000
@@ -75,9 +75,9 @@
 INSERT INTO t1 VALUES(1);
 CREATE TABLE t2(GMT  VARCHAR(32));
 INSERT INTO t2 VALUES('GMT-0800');
-SELECT DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)) FROM t1, t2 GROUP BY t1.AFIELD;
+SELECT DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)) FROM t1 CROSS JOIN t2 GROUP BY t1.AFIELD;
 INSERT INTO t1 VALUES(1);
-SELECT DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)), DATE_FORMAT("2002-03-06 10:11:12",  CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)) FROM t1,t2 GROUP BY t1.AFIELD;
+SELECT DATE_FORMAT("2002-03-06 10:11:12", CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)), DATE_FORMAT("2002-03-06 10:11:12",  CONCAT('%a, %d %M %Y %H:%i:%s ' ,  t2.GMT)) FROM t1 CROSS JOIN t2 GROUP BY t1.AFIELD;
 drop table t1,t2;
 
 #

=== modified file 'tests/t/type_float.test'
--- tests/t/type_float.test	2010-08-26 21:56:15 +0000
+++ tests/t/type_float.test	2011-02-07 17:26:32 +0000
@@ -164,7 +164,7 @@
 desc t1;
 create table t2 select 105213674794682365.00 y;
 desc t2;
-create table t3 select x+y a from t1,t2;
+create table t3 select x+y a from t1 CROSS JOIN t2;
 show warnings;
 desc t3;
 drop table t1,t2,t3;

=== modified file 'tests/t/type_ranges.test'
--- tests/t/type_ranges.test	2010-08-26 21:56:15 +0000
+++ tests/t/type_ranges.test	2011-02-07 17:26:32 +0000
@@ -122,7 +122,7 @@
 create table t2 select * from t1;
 --error ER_DUP_FIELDNAME
 create table t3 select * from t1, t2; # Should give an error
-create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1, t2;
+create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1 CROSS JOIN t2;
 # We mask out the Privileges column because it differs with embedded server
 --replace_column 8 #
 show columns from t3;

=== modified file 'tests/t/union.test'
--- tests/t/union.test	2011-02-04 04:21:02 +0000
+++ tests/t/union.test	2011-02-07 17:26:32 +0000
@@ -316,7 +316,7 @@
 insert into t2 (group_name) values ('Group A');
 insert into t2 (group_name) values ('Group B');
 insert into t3 (user_id, group_id) values (1,1);
-select 1 'is_in_group', a.user_name, c.group_name, b.id from t1 a, t3 b, t2 c where a.id = b.user_id and b.group_id = c.id UNION  select 0 'is_in_group', a.user_name, c.group_name, null from t1 a, t2 c;
+select 1 'is_in_group', a.user_name, c.group_name, b.id from t1 a, t3 b, t2 c where a.id = b.user_id and b.group_id = c.id UNION  select 0 'is_in_group', a.user_name, c.group_name, null from t1 a CROSS JOIN t2 c;
 drop table t3, t1, t2;
 
 #

=== modified file 'tests/t/update.test'
--- tests/t/update.test	2011-01-05 07:43:57 +0000
+++ tests/t/update.test	2011-02-07 17:26:32 +0000
@@ -214,7 +214,7 @@
 create table t1 (a int);
 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t2 (a int, filler1 char(200), filler2 char(200), key(a));
-insert into t2 select A.a + 10*B.a, 'filler','filler' from t1 A, t1 B;
+insert into t2 select A.a + 10*B.a, 'filler','filler' from t1 A CROSS JOIN t1 B;
 flush status;
 update t2 set a=3 where a=2;
 --replace_column 2 #