test fix

mysql-test/r/partition.result

@@ -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';

mysql-test/t/partition.test

@@ -1076,6 +1076,5 @@ REPAIR TABLE t1;
 OPTIMIZE TABLE t1;
 
 drop table t1;
->>>>>>>
 
 --echo End of 5.1 tests