bzr commit into mysql-pe branch (jorgen.loland:3682) Bug#48052

[Jorgen Loland]

#At file:///localhome/jl208045/mysql/mysql-5.1-branches/mysql-pe/ based on revid:jorgen.loland@stripped

 3682 Jorgen Loland	2009-11-13
      Turning engine_condition_pushdown off for test of BUG#48052 in the 6.0 codebase

    modified:
      mysql-test/r/select.result
      mysql-test/r/select_jcl6.result
      mysql-test/t/select.test
=== modified file 'mysql-test/r/select.result'
--- a/mysql-test/r/select.result	2009-11-13 11:26:00 +0000
+++ b/mysql-test/r/select.result	2009-11-13 11:32:38 +0000
@@ -4581,6 +4581,11 @@ drop table A,AA,B,BB;
 # 
 # BUG#48052: Valgrind warning - uninitialized value in init_read_record()
 # 
+# Disable Index condition pushdown
+SELECT @old_icp:=@@engine_condition_pushdown;
+@old_icp:=@@engine_condition_pushdown
+#
+SET SESSION engine_condition_pushdown = 'OFF';
 CREATE TABLE t1 (
 pk int(11) NOT NULL,
 i int(11) DEFAULT NULL,
@@ -4595,6 +4600,8 @@ WHERE NOT pk > 0  
 HAVING v <= 't' 
 ORDER BY pk;
 v
+# Restore old value for Index condition pushdown
+SET SESSION engine_condition_pushdown=@old_icp;
 DROP TABLE t1;
 End of 5.1 tests
 CREATE TABLE t1 (a INT KEY, b INT);

=== modified file 'mysql-test/r/select_jcl6.result'
--- a/mysql-test/r/select_jcl6.result	2009-11-10 11:39:00 +0000
+++ b/mysql-test/r/select_jcl6.result	2009-11-13 11:32:38 +0000
@@ -4582,6 +4582,31 @@ field2
 15:13:38
 drop table A,AA,B,BB;
 #end of test for bug#45266
+# 
+# BUG#48052: Valgrind warning - uninitialized value in init_read_record()
+# 
+# Disable Index condition pushdown
+SELECT @old_icp:=@@engine_condition_pushdown;
+@old_icp:=@@engine_condition_pushdown
+#
+SET SESSION engine_condition_pushdown = 'OFF';
+CREATE TABLE t1 (
+pk int(11) NOT NULL,
+i int(11) DEFAULT NULL,
+v varchar(1) DEFAULT NULL,
+PRIMARY KEY (pk)
+);
+INSERT INTO t1 VALUES (2,7,'m');
+INSERT INTO t1 VALUES (3,9,'m');
+SELECT  v
+FROM t1
+WHERE NOT pk > 0  
+HAVING v <= 't' 
+ORDER BY pk;
+v
+# Restore old value for Index condition pushdown
+SET SESSION engine_condition_pushdown=@old_icp;
+DROP TABLE t1;
 End of 5.1 tests
 CREATE TABLE t1 (a INT KEY, b INT);
 INSERT INTO t1 VALUES (1,1), (2,2), (3,3), (4,4);

=== modified file 'mysql-test/t/select.test'
--- a/mysql-test/t/select.test	2009-11-13 11:26:00 +0000
+++ b/mysql-test/t/select.test	2009-11-13 11:32:38 +0000
@@ -3924,10 +3924,10 @@ drop table A,AA,B,BB;
 --echo # 
 
 # Needed in 6.0 codebase
-#--echo # Disable Index condition pushdown
-#--replace_column 1 #
-#SELECT @old_icp:=@@engine_condition_pushdown;
-#SET SESSION engine_condition_pushdown = 'OFF';
+--echo # Disable Index condition pushdown
+--replace_column 1 #
+SELECT @old_icp:=@@engine_condition_pushdown;
+SET SESSION engine_condition_pushdown = 'OFF';
 
 CREATE TABLE t1 (
   pk int(11) NOT NULL,
@@ -3946,8 +3946,8 @@ HAVING v <= 't' 
 ORDER BY pk;
 
 # Needed in 6.0 codebase
-#--echo # Restore old value for Index condition pushdown
-#SET SESSION engine_condition_pushdown=@old_icp;
+--echo # Restore old value for Index condition pushdown
+SET SESSION engine_condition_pushdown=@old_icp;
 
 DROP TABLE t1;
 


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