From: Sergey Petrunia
Date: December 26 2005 7:16am
Subject: bk commit into 5.1 tree (sergefp:1.1975)
List-Archive: http://lists.mysql.com/commits/410
Message-Id: <20051226071643.9070D2D7B69@newbox.mylan>

Below is the list of changes that have just been committed into a local
5.1 repository of psergey. When psergey 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
  1.1975 05/12/26 10:16:36 sergefp@stripped +4 -0
  add missing DROP TABLE [IF EXISTS] clauses

  mysql-test/t/ps.test
    1.57 05/12/26 10:16:29 sergefp@stripped +1 -1
    add missing DROP TABLE [IF EXISTS] clauses

  mysql-test/t/partition_pruning.test
    1.3 05/12/26 10:16:29 sergefp@stripped +1 -0
    add missing DROP TABLE [IF EXISTS] clauses

  mysql-test/r/ps.result
    1.57 05/12/26 10:16:29 sergefp@stripped +1 -1
    add missing DROP TABLE [IF EXISTS] clauses

  mysql-test/r/partition_pruning.result
    1.3 05/12/26 10:16:29 sergefp@stripped +1 -0
    add missing DROP TABLE [IF EXISTS] clauses

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.1-ppruning-r4

--- 1.2/mysql-test/r/partition_pruning.result	2005-12-26 08:39:57 +03:00
+++ 1.3/mysql-test/r/partition_pruning.result	2005-12-26 10:16:29 +03:00
@@ -249,6 +249,7 @@
 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;

--- 1.56/mysql-test/r/ps.result	2005-12-02 10:57:17 +03:00
+++ 1.57/mysql-test/r/ps.result	2005-12-26 10:16:29 +03:00
@@ -1,4 +1,4 @@
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3,t4;
 drop database if exists client_test_db;
 create table t1
 (

--- 1.2/mysql-test/t/partition_pruning.test	2005-12-26 08:39:58 +03:00
+++ 1.3/mysql-test/t/partition_pruning.test	2005-12-26 10:16:29 +03:00
@@ -223,6 +223,7 @@
 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;

--- 1.56/mysql-test/t/ps.test	2005-11-28 21:51:26 +03:00
+++ 1.57/mysql-test/t/ps.test	2005-12-26 10:16:29 +03:00
@@ -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;