2985 Georgi Kodinov 2009-01-29 [merge]
fixed a non-updated test result of bug #37822 causing failures in test suite.
modified:
mysql-test/lib/mtr_report.pl
mysql-test/r/subselect_no_opts.result
2984 Alfranio Correia 2009-01-29 [merge]
merge 6.0-bugteam --> 6.0-bugteam (local)
removed:
mysql-test/std_data/server-cert-des.pem
mysql-test/std_data/server-key-des.pem
added:
mysql-test/suite/bugs/r/rpl_bug36391.result
mysql-test/suite/bugs/t/rpl_bug36391-master.opt
mysql-test/suite/bugs/t/rpl_bug36391.test
modified:
client/mysql.cc
mysql-test/include/setup_fake_relay_log.inc
mysql-test/r/openssl_1.result
mysql-test/r/query_cache_notembedded.result
mysql-test/r/subselect.result
mysql-test/r/subselect3.result
mysql-test/r/subselect3_jcl6.result
mysql-test/r/subselect_no_mat.result
mysql-test/r/subselect_no_semijoin.result
mysql-test/std_data/cacert.pem
mysql-test/std_data/client-cert.pem
mysql-test/std_data/client-key.pem
mysql-test/std_data/server-cert.pem
mysql-test/std_data/server-key.pem
mysql-test/std_data/server8k-cert.pem
mysql-test/std_data/server8k-key.pem
mysql-test/suite/rpl/t/rpl_cross_version-master.opt
mysql-test/t/openssl_1.test
mysql-test/t/query_cache_notembedded.test
mysql-test/t/subselect.test
mysql-test/t/subselect3.test
sql/handler.cc
sql/item_cmpfunc.cc
sql/sql_select.cc
=== modified file 'mysql-test/lib/mtr_report.pl'
--- a/mysql-test/lib/mtr_report.pl 2009-01-06 16:52:32 +0000
+++ b/mysql-test/lib/mtr_report.pl 2009-01-29 13:55:56 +0000
@@ -497,6 +497,11 @@ sub mtr_report_stats ($) {
# this test is expected to print warnings
($testname eq 'main.innodb_bug39438') or
+ # Bug#39886, logs 'Table full' error message
+ (($testname eq 'main.almost_full' or
+ $testname eq 'main.myisam_data_pointer_size_func') and
+ (/The table '.*' is full/
+ )) or
# maria-recovery.test has warning about missing log file
/File '.*maria_log.000.*' not found \(Errcode: 2\)/ or
# and about marked-corrupted table
=== modified file 'mysql-test/r/subselect_no_opts.result'
--- a/mysql-test/r/subselect_no_opts.result 2008-12-29 16:40:21 +0000
+++ b/mysql-test/r/subselect_no_opts.result 2009-01-29 13:55:56 +0000
@@ -4663,7 +4663,6 @@ SELECT t1.a, (SELECT 1 FROM t2 WHERE t2.
a incorrect
1 1
DROP TABLE t1,t2,t3;
-End of 5.1 tests.
CREATE TABLE t1( a INT );
INSERT INTO t1 VALUES (1),(2);
CREATE TABLE t2( a INT, b INT );
@@ -4925,6 +4924,43 @@ ERROR 42000: You have an error in your S
SELECT * FROM t1 WHERE a IN ( SELECT 1 INTO @v );
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'INTO @v )' at line 1
DROP TABLE t1, t2;
+#
+# BUG#37822: Correlated subquery with IN and IS UNKNOWN provides wrong result
+#
+create table t1(id integer primary key, g integer, v integer, s char(1));
+create table t2(id integer primary key, g integer, v integer, s char(1));
+insert into t1 values
+(10, 10, 10, 'l'),
+(20, 20, 20, 'l'),
+(40, 40, 40, 'l'),
+(41, 40, null, 'l'),
+(50, 50, 50, 'l'),
+(51, 50, null, 'l'),
+(60, 60, 60, 'l'),
+(61, 60, null, 'l'),
+(70, 70, 70, 'l'),
+(90, 90, null, 'l');
+insert into t2 values
+(10, 10, 10, 'r'),
+(30, 30, 30, 'r'),
+(50, 50, 50, 'r'),
+(60, 60, 60, 'r'),
+(61, 60, null, 'r'),
+(70, 70, 70, 'r'),
+(71, 70, null, 'r'),
+(80, 80, 80, 'r'),
+(81, 80, null, 'r'),
+(100,100,null, 'r');
+select *
+from t1
+where v in(select v
+from t2
+where t1.g=t2.g) is unknown;
+id g v s
+51 50 NULL l
+61 60 NULL l
+drop table t1, t2;
+End of 5.1 tests.
set optimizer_switch='';
show variables like 'optimizer_switch';
Variable_name Value
| Thread |
|---|
| • bzr push into mysql-6.0-bugteam branch (joro:2984 to 2985) Bug#37822 | Georgi Kodinov | 29 Jan |
