bk commit into 5.1 tree (jimw:1.2113)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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.2113 06/02/15 17:01:31 jimw@stripped +2 -0
  Small post-merge fix to partition test

  mysql-test/t/partition.test
    1.15 06/02/15 17:01:27 jimw@stripped +1 -0
    Add missing drop table

  mysql-test/r/partition.result
    1.14 06/02/15 17:01:27 jimw@stripped +1 -0
    Update results

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-clean

--- 1.13/mysql-test/r/partition.result	2006-02-15 11:39:51 -08:00
+++ 1.14/mysql-test/r/partition.result	2006-02-15 17:01:27 -08:00
@@ -305,6 +305,7 @@
 partition by range (f_int1) subpartition by hash (f_int1)
 (partition part1 values less than (1000)
 (subpartition subpart11 engine = memory));
+drop table t1;
 set session storage_engine='myisam';
 create table t1 (f_int1 integer, f_int2 integer, primary key (f_int1))
 partition by hash(f_int1) partitions 2;

--- 1.14/mysql-test/t/partition.test	2006-02-15 11:39:51 -08:00
+++ 1.15/mysql-test/t/partition.test	2006-02-15 17:01:27 -08:00
@@ -389,6 +389,7 @@
   partition by range (f_int1) subpartition by hash (f_int1)
   (partition part1 values less than (1000)
    (subpartition subpart11 engine = memory));
+drop table t1;
 set session storage_engine='myisam';
 
 #