Fix test after merge

mysql-test/r/create.result:
  update test results

mysql-test/r/create.result

@@ -15,6 +15,8 @@ select * from t1;
 b
 
 
+drop table t1;
+create table t1 (a int not null auto_increment,primary key (a)) type=heap;
 drop table t1;
 create table t2 type=heap select * from t1;
 ERROR 42S02: Table 'test.t1' doesn't exist
@@ -26,10 +28,11 @@ Note	1051	Unknown table 't1'
 Note	1051	Unknown table 't2'
 create table t1 (b char(0) not null, index(b));
 ERROR 42000: The used storage engine can't index column 'b'
-create table t1 (a int not null auto_increment,primary key (a)) type=heap;
 create table t1 (a int not null,b text) type=heap;
 ERROR 42000: The used table type doesn't support BLOB/TEXT columns
 drop table if exists t1;
+Warnings:
+Note	1051	Unknown table 't1'
 create table t1 (ordid int(8) not null auto_increment, ord  varchar(50) not null, primary key (ord,ordid)) type=heap;
 ERROR 42000: Incorrect table definition; There can only be one auto column and it must be defined as a key
 create table not_existing_database.test (a int);

mysql-test/t/create.test

@@ -17,6 +17,9 @@ insert into t1 values (""),(null);
 select * from t1;
 drop table t1;
 
+create table t1 (a int not null auto_increment,primary key (a)) type=heap;
+drop table t1;
+
 #
 # Test of some CREATE TABLE'S that should fail
 #
@@ -28,8 +31,6 @@ create table t2 select auto+1 from t1;
 drop table if exists t1,t2;
 --error 1167
 create table t1 (b char(0) not null, index(b));
---error 1164
-create table t1 (a int not null auto_increment,primary key (a)) type=heap;
 --error 1163
 create table t1 (a int not null,b text) type=heap;
 drop table if exists t1;