bk commit into 6.0 tree (kaa:1.2779) BUG#33675

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
6.0 repository of kaa. When kaa 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, 2008-01-10 19:26:41+03:00, kaa@kaamos.(none) +3 -0
  Post-merge fix for the patch for bug #33675 after the merge to 6.0.

  mysql-test/r/subselect_no_mat.result@stripped, 2008-01-10 19:26:40+03:00, kaa@kaamos.(none)
+9 -0
    Post-merge fix for the patch for bug #33675 after the merge to 6.0.

  mysql-test/r/subselect_no_opts.result@stripped, 2008-01-10 19:26:40+03:00, kaa@kaamos.(none)
+9 -0
    Post-merge fix for the patch for bug #33675 after the merge to 6.0.

  mysql-test/r/subselect_no_semijoin.result@stripped, 2008-01-10 19:26:40+03:00,
kaa@kaamos.(none) +9 -0
    Post-merge fix for the patch for bug #33675 after the merge to 6.0.

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-12-13 15:47:12 +03:00
+++ b/mysql-test/r/subselect_no_mat.result	2008-01-10 19:26:40 +03:00
@@ -4277,6 +4277,15 @@ SELECT 2 FROM t1 WHERE EXISTS ((SELECT 1
 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 'UNION 
 (SELECT 1 FROM t2 WHERE t1.a = t2.a))' at line 2
 DROP TABLE t1,t2;
+create table t1(f11 int, f12 int);
+create table t2(f21 int unsigned not null, f22 int, f23 varchar(10));
+insert into t1 values(1,1),(2,2), (3, 3);
+set session sort_buffer_size= 33*1024;
+select count(*) from t1 where f12 = 
+(select f22 from t2 where f22 = f12 order by f21 desc, f22, f23 limit 1);
+count(*)
+3
+drop table t1,t2;
 End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));
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-12-13 15:47:12 +03:00
+++ b/mysql-test/r/subselect_no_opts.result	2008-01-10 19:26:40 +03:00
@@ -4277,6 +4277,15 @@ SELECT 2 FROM t1 WHERE EXISTS ((SELECT 1
 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 'UNION 
 (SELECT 1 FROM t2 WHERE t1.a = t2.a))' at line 2
 DROP TABLE t1,t2;
+create table t1(f11 int, f12 int);
+create table t2(f21 int unsigned not null, f22 int, f23 varchar(10));
+insert into t1 values(1,1),(2,2), (3, 3);
+set session sort_buffer_size= 33*1024;
+select count(*) from t1 where f12 = 
+(select f22 from t2 where f22 = f12 order by f21 desc, f22, f23 limit 1);
+count(*)
+3
+drop table t1,t2;
 End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));
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-12-13 15:47:12 +03:00
+++ b/mysql-test/r/subselect_no_semijoin.result	2008-01-10 19:26:40 +03:00
@@ -4277,6 +4277,15 @@ SELECT 2 FROM t1 WHERE EXISTS ((SELECT 1
 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 'UNION 
 (SELECT 1 FROM t2 WHERE t1.a = t2.a))' at line 2
 DROP TABLE t1,t2;
+create table t1(f11 int, f12 int);
+create table t2(f21 int unsigned not null, f22 int, f23 varchar(10));
+insert into t1 values(1,1),(2,2), (3, 3);
+set session sort_buffer_size= 33*1024;
+select count(*) from t1 where f12 = 
+(select f22 from t2 where f22 = f12 order by f21 desc, f22, f23 limit 1);
+count(*)
+3
+drop table t1,t2;
 End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));