bk commit into 6.0 tree (istruewing:1.2688) BUG#32646

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
6.0 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-23 09:44:55+01:00, istruewing@stripped +5 -0
  Bug#32646 - subselect.test produces warnings files
  
  Comment sign of -- at line begin in test files lead to warnings
  from mysqltest.
  
  Replaced '--' comments by '#' comments or '--echo'.

  mysql-test/r/subselect.result@stripped, 2007-11-23 09:44:54+01:00, istruewing@stripped +1 -0
    Bug#32646 - subselect.test produces warnings files
    Fixed test result

  mysql-test/r/subselect_no_mat.result@stripped, 2007-11-23 09:44:54+01:00, istruewing@stripped +1 -0
    Bug#32646 - subselect.test produces warnings files
    Fixed test result

  mysql-test/r/subselect_no_opts.result@stripped, 2007-11-23 09:44:54+01:00, istruewing@stripped +1 -0
    Bug#32646 - subselect.test produces warnings files
    Fixed test result

  mysql-test/r/subselect_no_semijoin.result@stripped, 2007-11-23 09:44:54+01:00, istruewing@stripped +1 -0
    Bug#32646 - subselect.test produces warnings files
    Fixed test result

  mysql-test/t/subselect.test@stripped, 2007-11-23 09:44:54+01:00, istruewing@stripped +4 -4
    Bug#32646 - subselect.test produces warnings files
    Replaced '--' comments by '#' comments or '--echo'.

diff -Nrup a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
--- a/mysql-test/r/subselect.result	2007-11-14 14:53:11 +01:00
+++ b/mysql-test/r/subselect.result	2007-11-23 09:44:54 +01:00
@@ -4260,6 +4260,7 @@ subcase	pred_in	pred_not_in
 B.4	0	1
 
 Test IN as top-level predicate, and
+as non-top level for cases A.3, B.3 (the only cases with NULL result).
 
 case A.1
 select case when count(*) > 0 then 'T' else 'F' end as pred_in from t_out
diff -Nrup a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result
--- a/mysql-test/r/subselect_no_mat.result	2007-11-15 09:06:58 +01:00
+++ b/mysql-test/r/subselect_no_mat.result	2007-11-23 09:44:54 +01:00
@@ -4264,6 +4264,7 @@ subcase	pred_in	pred_not_in
 B.4	0	1
 
 Test IN as top-level predicate, and
+as non-top level for cases A.3, B.3 (the only cases with NULL result).
 
 case A.1
 select case when count(*) > 0 then 'T' else 'F' end as pred_in from t_out
diff -Nrup a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result
--- a/mysql-test/r/subselect_no_opts.result	2007-11-15 09:06:58 +01:00
+++ b/mysql-test/r/subselect_no_opts.result	2007-11-23 09:44:54 +01:00
@@ -4264,6 +4264,7 @@ subcase	pred_in	pred_not_in
 B.4	0	1
 
 Test IN as top-level predicate, and
+as non-top level for cases A.3, B.3 (the only cases with NULL result).
 
 case A.1
 select case when count(*) > 0 then 'T' else 'F' end as pred_in from t_out
diff -Nrup a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result
--- a/mysql-test/r/subselect_no_semijoin.result	2007-11-15 09:06:58 +01:00
+++ b/mysql-test/r/subselect_no_semijoin.result	2007-11-23 09:44:54 +01:00
@@ -4264,6 +4264,7 @@ subcase	pred_in	pred_not_in
 B.4	0	1
 
 Test IN as top-level predicate, and
+as non-top level for cases A.3, B.3 (the only cases with NULL result).
 
 case A.1
 select case when count(*) > 0 then 'T' else 'F' end as pred_in from t_out
diff -Nrup a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
--- a/mysql-test/t/subselect.test	2007-11-14 14:53:12 +01:00
+++ b/mysql-test/t/subselect.test	2007-11-23 09:44:54 +01:00
@@ -3042,7 +3042,7 @@ create table t_out (subcase char(3),
 create table t_in  (a2 char(2), b2 char(2), c2 char(2));
 
 insert into t_out values ('A.1','2a', NULL, '2a');
--------------------------- A.2 - impossible
+#------------------------- A.2 - impossible
 insert into t_out values ('A.3', '2a', NULL, '2a');
 insert into t_out values ('A.4', '2a', NULL, 'xx');
 insert into t_out values ('B.1', '2a', '2a', '2a');
@@ -3103,7 +3103,7 @@ from t_out where subcase = 'B.4';
 
 -- echo 
 -- echo Test IN as top-level predicate, and
--- as non-top level for cases A.3, B.3 (the only cases with NULL result).
+-- echo as non-top level for cases A.3, B.3 (the only cases with NULL result).
 -- echo 
 -- echo case A.1
 select case when count(*) > 0 then 'T' else 'F' end as pred_in from t_out
@@ -3130,7 +3130,7 @@ where subcase = 'A.3' and
 select case when count(*) > 0 then 'T' else 'F' end as not_pred_in from t_out
 where subcase = 'A.3' and
       NOT((a1, b1, c1) IN (select * from t_in));
--- test non-top level result indirectly
+# test non-top level result indirectly
 select case when count(*) > 0 then 'N' else 'wrong result' end as pred_in from t_out
 where subcase = 'A.3' and
       ((a1, b1, c1) IN (select * from t_in)) is NULL and
@@ -3187,7 +3187,7 @@ where subcase = 'B.3' and
 select case when count(*) > 0 then 'T' else 'F' end as not_pred_in from t_out
 where subcase = 'B.3' and
       NOT((a1, b1, c1) IN (select * from t_in));
--- test non-top level result indirectly
+# test non-top level result indirectly
 select case when count(*) > 0 then 'N' else 'wrong result' end as pred_in from t_out
 where subcase = 'B.3' and
       ((a1, b1, c1) IN (select * from t_in)) is NULL and