bzr commit into mysql-6.0-opt branch (sergefp:2690) Bug#37842

[Sergey Petrunia]

#At file:///home/spetrunia/dev/mysql-6.0-opt-merge3/ based on
revid:sergefp@stripped

 2690 Sergey Petrunia	2009-02-02
      Fix test results after merge of BUG#37842
modified:
  mysql-test/r/subselect3.result
  mysql-test/r/subselect3_jcl6.result

per-file messages:
  mysql-test/r/subselect3.result
    Fix test results after merge of BUG#37842
  mysql-test/r/subselect3_jcl6.result
    Fix test results after merge of BUG#37842
=== modified file 'mysql-test/r/subselect3.result'
--- a/mysql-test/r/subselect3.result	2009-02-02 14:12:27 +0000
+++ b/mysql-test/r/subselect3.result	2009-02-02 17:36:54 +0000
@@ -805,23 +805,9 @@ WHERE INNR.varchar_key > 'n{'
 varchar_nokey
 DROP TABLE t1;
 End of 5.0 tests
-
-BUG#37842: Assertion in DsMrr_impl::dsmrr_init, at handler.cc:4307
-
-CREATE TABLE t1 (
-`pk` int(11) NOT NULL AUTO_INCREMENT,
-`int_key` int(11) DEFAULT NULL,
-PRIMARY KEY (`pk`),
-KEY `int_key` (`int_key`)
-) ENGINE=MyISAM;
-INSERT INTO t1 VALUES (1,9),(2,3),(3,8),(4,6),(5,9),(6,5),(7,5),(8,9),(9,1),(10,10);
-SELECT `pk` FROM t1 AS OUTR WHERE `int_key` = ALL (
-SELECT `int_key` FROM t1 AS INNR WHERE INNR . `pk` >= 9
-);
-pk
 #  
 # BUG#36896: Server crash on SELECT FROM DUAL
-#
+# 
 create table t1 (a int);
 select 1 as res from dual where (1) in (select * from t1);
 res
@@ -858,9 +844,6 @@ b int(11) NOT NULL,
 c datetime default NULL,
 PRIMARY KEY  (a),
 KEY idx_bc (b,c)
-INSERT INTO t1 VALUES (1,9),(2,3),(3,8),(4,6),(5,9),(6,5),(7,5),(8,9),(9,1),(10,10);
-SELECT `pk` FROM t1 AS OUTR WHERE `int_key` = ALL (
-SELECT `int_key` FROM t1 AS INNR WHERE INNR . `pk` >= 9
 );
 INSERT INTO t1 VALUES 
 (406989,67,'2006-02-23 17:08:46'), (150078,67,'2005-10-26 11:17:45'),
@@ -1182,6 +1165,21 @@ id	select_type	table	type	possible_keys	
 1	PRIMARY	Z	ALL	NULL	NULL	NULL	NULL	6	End materialize; Using join buffer
 drop table t0,t1,t2;
 
+BUG#37842: Assertion in DsMrr_impl::dsmrr_init, at handler.cc:4307
+
+CREATE TABLE t1 (
+`pk` int(11) NOT NULL AUTO_INCREMENT,
+`int_key` int(11) DEFAULT NULL,
+PRIMARY KEY (`pk`),
+KEY `int_key` (`int_key`)
+) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (1,9),(2,3),(3,8),(4,6),(5,9),(6,5),(7,5),(8,9),(9,1),(10,10);
+SELECT `pk` FROM t1 AS OUTR WHERE `int_key` = ALL (
+SELECT `int_key` FROM t1 AS INNR WHERE INNR . `pk` >= 9
+);
+pk
+DROP TABLE t1;
+
 BUG#40118 Crash when running Batched Key Access and requiring one match for each key
 
 create table t0(a int);

=== modified file 'mysql-test/r/subselect3_jcl6.result'
--- a/mysql-test/r/subselect3_jcl6.result	2009-01-14 10:29:36 +0000
+++ b/mysql-test/r/subselect3_jcl6.result	2009-02-02 17:36:54 +0000
@@ -1170,6 +1170,21 @@ id	select_type	table	type	possible_keys	
 1	PRIMARY	Z	ALL	NULL	NULL	NULL	NULL	6	End materialize; Using join buffer
 drop table t0,t1,t2;
 
+BUG#37842: Assertion in DsMrr_impl::dsmrr_init, at handler.cc:4307
+
+CREATE TABLE t1 (
+`pk` int(11) NOT NULL AUTO_INCREMENT,
+`int_key` int(11) DEFAULT NULL,
+PRIMARY KEY (`pk`),
+KEY `int_key` (`int_key`)
+) ENGINE=MyISAM;
+INSERT INTO t1 VALUES (1,9),(2,3),(3,8),(4,6),(5,9),(6,5),(7,5),(8,9),(9,1),(10,10);
+SELECT `pk` FROM t1 AS OUTR WHERE `int_key` = ALL (
+SELECT `int_key` FROM t1 AS INNR WHERE INNR . `pk` >= 9
+);
+pk
+DROP TABLE t1;
+
 BUG#40118 Crash when running Batched Key Access and requiring one match for each key
 
 create table t0(a int);