bzr commit into mysql-6.0-codebase-bugfixing branch (martin.hansson:3718) Bug#33204

[Martin Hansson]

#At file:///data0/martin/bzr/bug33204/6.0c-b/ based on revid:guilhem@stripped

 3718 Martin Hansson	2009-11-20 [merge]
      Up merge of backport of Bug#33204 from mysql-pe to
      mysql-next-mr-bugfixing. (Minor test case/result changes)

    modified:
      mysql-test/r/subselect.result
      mysql-test/r/subselect_no_mat.result
      mysql-test/r/subselect_no_opts.result
      mysql-test/r/subselect_no_semijoin.result
      mysql-test/r/union.result
      mysql-test/t/subselect.test
      mysql-test/t/union.test
=== modified file 'mysql-test/r/subselect.result'
--- a/mysql-test/r/subselect.result	2009-11-09 10:27:46 +0000
+++ b/mysql-test/r/subselect.result	2009-11-20 09:16:27 +0000
@@ -4718,6 +4718,9 @@ SELECT t1.a, (SELECT 1 FROM t2 WHERE t2.
 a	incorrect
 1	1
 DROP TABLE t1,t2,t3;
+#
+# Bug#33204: INTO is allowed in subselect, causing inconsistent results
+#
 CREATE TABLE t1( a INT );
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2( a INT, b INT );

=== modified file 'mysql-test/r/subselect_no_mat.result'
--- a/mysql-test/r/subselect_no_mat.result	2009-11-03 18:09:53 +0000
+++ b/mysql-test/r/subselect_no_mat.result	2009-11-20 09:16:27 +0000
@@ -4722,6 +4722,9 @@ SELECT t1.a, (SELECT 1 FROM t2 WHERE t2.
 a	incorrect
 1	1
 DROP TABLE t1,t2,t3;
+#
+# Bug#33204: INTO is allowed in subselect, causing inconsistent results
+#
 CREATE TABLE t1( a INT );
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2( a INT, b INT );

=== modified file 'mysql-test/r/subselect_no_opts.result'
--- a/mysql-test/r/subselect_no_opts.result	2009-11-03 18:09:53 +0000
+++ b/mysql-test/r/subselect_no_opts.result	2009-11-20 09:16:27 +0000
@@ -4722,6 +4722,9 @@ SELECT t1.a, (SELECT 1 FROM t2 WHERE t2.
 a	incorrect
 1	1
 DROP TABLE t1,t2,t3;
+#
+# Bug#33204: INTO is allowed in subselect, causing inconsistent results
+#
 CREATE TABLE t1( a INT );
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2( a INT, b INT );

=== modified file 'mysql-test/r/subselect_no_semijoin.result'
--- a/mysql-test/r/subselect_no_semijoin.result	2009-11-03 18:09:53 +0000
+++ b/mysql-test/r/subselect_no_semijoin.result	2009-11-20 09:16:27 +0000
@@ -4722,6 +4722,9 @@ SELECT t1.a, (SELECT 1 FROM t2 WHERE t2.
 a	incorrect
 1	1
 DROP TABLE t1,t2,t3;
+#
+# Bug#33204: INTO is allowed in subselect, causing inconsistent results
+#
 CREATE TABLE t1( a INT );
 INSERT INTO t1 VALUES (1),(2);
 CREATE TABLE t2( a INT, b INT );

=== modified file 'mysql-test/r/union.result'
--- a/mysql-test/r/union.result	2009-05-15 07:27:27 +0000
+++ b/mysql-test/r/union.result	2009-11-20 09:16:27 +0000
@@ -1546,8 +1546,13 @@ Warnings:
 Note	1003	select '0' AS `a` from `test`.`t1` union select '0' AS `a` from `test`.`t1` order by `a`
 DROP TABLE t1;
 End of 5.0 tests
+#
+# Bug#32858: Error: "Incorrect usage of UNION and INTO" does not take 
+# subselects into account
+#
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1);
+# Tests fix in parser rule select_derived_union.
 SELECT a INTO @v FROM (
 SELECT a FROM t1
 UNION
@@ -1572,6 +1577,7 @@ SELECT a INTO OUTFILE 'union.out.file7' 
 ERROR HY000: Incorrect usage of UNION and INTO
 SELECT a INTO DUMPFILE 'union.out.file8' FROM t1 UNION SELECT a FROM t1;
 ERROR HY000: Incorrect usage of UNION and INTO
+# Tests fix in parser rule query_expression_body.
 SELECT ( SELECT a UNION SELECT a ) INTO @v FROM t1;
 SELECT ( SELECT a UNION SELECT a ) INTO OUTFILE  'union.out.file3' FROM t1;
 SELECT ( SELECT a UNION SELECT a ) INTO DUMPFILE 'union.out.file4' FROM t1;

=== modified file 'mysql-test/t/subselect.test'
--- a/mysql-test/t/subselect.test	2009-11-09 10:27:46 +0000
+++ b/mysql-test/t/subselect.test	2009-11-20 09:16:27 +0000
@@ -3686,9 +3686,9 @@ SELECT t1.a, (SELECT 1 FROM t2 WHERE t2.
 
 DROP TABLE t1,t2,t3;
 
-#
-# Bug#33204 INTO is allowed in subselect, causing inconsistent results
-#
+-- echo #
+-- echo # Bug#33204: INTO is allowed in subselect, causing inconsistent results
+-- echo #
 CREATE TABLE t1( a INT );
 INSERT INTO t1 VALUES (1),(2);
 

=== modified file 'mysql-test/t/union.test'
--- a/mysql-test/t/union.test	2009-05-15 07:27:27 +0000
+++ b/mysql-test/t/union.test	2009-11-20 09:16:27 +0000
@@ -93,7 +93,6 @@ SELECT @a:=1 UNION SELECT @a:=@a+1;
 (SELECT 1) UNION (SELECT 2) ORDER BY (SELECT a);
 (SELECT 1,3) UNION (SELECT 2,1) ORDER BY (SELECT 2);
 
-
 #
 # Test bug reported by joc@stripped
 #
@@ -1023,14 +1022,15 @@ DROP TABLE t1;
 
 
 --echo End of 5.0 tests
-#
-# Bug#32858: Error: "Incorrect usage of UNION and INTO" does not take subselects 
-# into account
-#
+
+-- echo #
+-- echo # Bug#32858: Error: "Incorrect usage of UNION and INTO" does not take 
+-- echo # subselects into account
+-- echo #
 CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (1);
 
-# Test fix in parser rule select_derived_union.
+-- echo # Tests fix in parser rule select_derived_union.
 SELECT a INTO @v FROM (
   SELECT a FROM t1
   UNION
@@ -1059,7 +1059,7 @@ SELECT a INTO OUTFILE 'union.out.file7' 
 --error ER_WRONG_USAGE
 SELECT a INTO DUMPFILE 'union.out.file8' FROM t1 UNION SELECT a FROM t1;
 
-# Tests fix in parser rule query_expression_body.
+-- echo # Tests fix in parser rule query_expression_body.
 SELECT ( SELECT a UNION SELECT a ) INTO @v FROM t1;
 SELECT ( SELECT a UNION SELECT a ) INTO OUTFILE  'union.out.file3' FROM t1;
 SELECT ( SELECT a UNION SELECT a ) INTO DUMPFILE 'union.out.file4' FROM t1;


Attachment: [text/bzr-bundle] bzr/[e-mail]