bk commit into 5.1 tree (sergefp:1.2019)

[Sergey Petrunia]

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.2019 06/01/10 21:10:51 sergefp@stripped +2 -0
  Post-merge fixes

  mysql-test/t/partition_select.test
    1.4 06/01/10 21:10:43 sergefp@stripped +0 -1
    Post-merge fixes

  mysql-test/r/partition_select.result
    1.4 06/01/10 21:10:43 sergefp@stripped +0 -1
    Post-merge fixes

# 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-wl2682

--- 1.3/mysql-test/r/partition_select.result	2006-01-10 18:31:29 +03:00
+++ 1.4/mysql-test/r/partition_select.result	2006-01-10 21:10:43 +03:00
@@ -318,7 +318,6 @@
 id	name	purchased
 1	aaaaaaa	2006-01-05
 drop table t1,t2,t3,t4,t5;
-drop table t1,t2;
 create table t1 (a int) partition by hash(a) partitions 3;
 insert into t1 values(1),(2),(3);
 explain partitions select * from t1 where a=1;

--- 1.3/mysql-test/t/partition_select.test	2006-01-10 18:31:29 +03:00
+++ 1.4/mysql-test/t/partition_select.test	2006-01-10 21:10:43 +03:00
@@ -142,7 +142,6 @@
 --disable_warnings
 drop table t1,t2,t3,t4,t5;
 --enable_warnings
-drop table t1,t2;
 
 # Tests for working together with partition pruning.
 create table t1 (a int) partition by hash(a) partitions 3;