Merge newbox:mysql-5.1-ppruning-r4

into  mysql.com:/home/psergey/mysql-5.1-26dec-merge

mysql-test/r/partition_pruning.result

@@ -249,6 +249,7 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 explain partitions select * from t3 where (a=2 or b=1) and (a=4 or b=2) ;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t3	p1_sp2,p3_sp1	ALL	NULL	NULL	NULL	NULL	3	Using where
+drop table t3;
 create table t1 (a int) partition by hash(a) partitions 2;
 insert into t1 values (1),(2);
 explain partitions select * from t1 where a is null;

mysql-test/r/ps.result

-drop table if exists t1,t2;
+drop table if exists t1,t2,t3,t4;
 drop database if exists client_test_db;
 create table t1
 (

mysql-test/t/partition_pruning.test

@@ -223,6 +223,7 @@ insert into t3 values (1,1),(2,2),(3,3);
 explain partitions select * from t3 where a=2 or b=1;
 explain partitions select * from t3 where a=4 or b=2;
 explain partitions select * from t3 where (a=2 or b=1) and (a=4 or b=2) ;
+drop table t3;
 
 # Test for NULLs
 create table t1 (a int) partition by hash(a) partitions 2;

mysql-test/t/ps.test

@@ -2,7 +2,7 @@
 # SQL Syntax for Prepared Statements test
 #
 --disable_warnings
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3,t4;
 
 # Avoid wrong warnings if mysql_client_test fails
 drop database if exists client_test_db;