bk commit into 5.1 tree (gluh:1.2188)

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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.2188 06/05/25 17:58:52 gluh@stripped +2 -0
  test fix

  mysql-test/t/partition.test
    1.44 06/05/25 17:58:45 gluh@stripped +0 -1
    test fix

  mysql-test/r/partition.result
    1.45 06/05/25 17:58:45 gluh@stripped +4 -4
    test fix

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/5.1-new

--- 1.44/mysql-test/r/partition.result	Wed May 24 22:56:19 2006
+++ 1.45/mysql-test/r/partition.result	Thu May 25 17:58:45 2006
@@ -890,15 +890,15 @@ s1
 2
 3
 drop table t1;
-create table t1 (a int)
-partition by key (a)
-(partition p0 engine = MERGE);
-ERROR HY000: MyISAM Merge handler cannot be used in partitioned tables
 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 int)
+partition by key (a)
+(partition p0 engine = MERGE);
+ERROR HY000: MyISAM Merge handler cannot be used in partitioned tables
 create table t1 (a varchar(1))
 partition by key (a)
 as select 'a';

--- 1.43/mysql-test/t/partition.test	Wed May 24 22:57:16 2006
+++ 1.44/mysql-test/t/partition.test	Thu May 25 17:58:45 2006
@@ -1076,6 +1076,5 @@ REPAIR TABLE t1;
 OPTIMIZE TABLE t1;
 
 drop table t1;
->>>>>>>
 
 --echo End of 5.1 tests