bk commit into 5.1 tree (acurtis:1.2393)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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.2393 06/05/12 22:30:13 acurtis@stripped +1 -0
  fix partition test

  mysql-test/r/partition.result
    1.42 06/05/12 22:29:56 acurtis@stripped +9 -5
    fix results - bad automerge

# 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:	acurtis
# Host:	localhost.(none)
# Root:	/home/antony/work2/mysql-5.1-fixpartition

--- 1.41/mysql-test/r/partition.result	2006-05-12 12:44:11 -07:00
+++ 1.42/mysql-test/r/partition.result	2006-05-12 22:29:56 -07:00
@@ -1,4 +1,8 @@
 drop table if exists t1;
+create table t1 (a int)
+partition by key(a)
+(partition p0 engine = MEMORY);
+drop table t1;
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -886,6 +890,11 @@ s1
 2
 3
 drop table t1;
+create table t1 (a int) engine=memory
+partition by key(a);
+insert into t1 values (1);
+create index inx1 on t1(a);
+drop table t1;
 create table t1 (a varchar(1))
 partition by key (a)
 as select 'a';
@@ -913,9 +922,4 @@ CREATE TABLE t1 (a int, index(a)) PARTIT
 ALTER TABLE t1 DISABLE KEYS;
 ALTER TABLE t1 ENABLE KEYS;
 DROP TABLE t1;
-create table t1 (a int) engine=memory
-partition by key(a);
-insert into t1 values (1);
-create index inx1 on t1(a);
-drop table t1;
 End of 5.1 tests