Update results after merge

mysql-test/r/create.result

@@ -220,10 +220,12 @@ ERROR 23000: Column 'k1' cannot be null
 insert into t1 values (NULL, NULL);
 ERROR 23000: Column 'k1' cannot be null
 drop table t1;
+create table t1 select x'4132';
+drop table t1;
 create table t1 select 1,2,3;
 create table if not exists t1 select 1,2;
 create table if not exists t1 select 1,2,3,4;
-Column count doesn't match value count at row 1
+ERROR 21S01: Column count doesn't match value count at row 1
 create table if not exists t1 select 1;
 select * from t1;
 1	2	3
@@ -234,7 +236,7 @@ drop table t1;
 create table t1 select 1,2,3;
 create table if not exists t1 select 1,2;
 create table if not exists t1 select 1,2,3,4;
-Column count doesn't match value count at row 1
+ERROR 21S01: Column count doesn't match value count at row 1
 create table if not exists t1 select 1;
 select * from t1;
 1	2	3
@@ -251,7 +253,7 @@ a	b
 0	2
 create table if not exists t1 select 3 as 'a',4 as 'b';
 create table if not exists t1 select 3 as 'a',3 as 'b';
-Duplicate entry '3' for key 1
+ERROR 23000: Duplicate entry '3' for key 1
 select * from t1;
 a	b
 1	1
@@ -358,8 +360,6 @@ t1	CREATE TABLE `t1` (
 ) TYPE=MyISAM CHARSET=latin1
 SET SESSION table_type=default;
 drop table t1;
-create table t1 select x'4132';
-drop table t1;
 create table t1(a int,b int,c int unsigned,d date,e char,f datetime,g time,h blob);
 insert into t1(a)values(1);
 insert into t1(a,b,c,d,e,f,g,h)

mysql-test/r/mysqldump.result

@@ -4,8 +4,6 @@ INSERT INTO t1 VALUES (1), (2);
 <?xml version="1.0"?>
 <mysqldump>
 <database name="test">
-DROP TABLE IF EXISTS t1;
-LOCK TABLES t1 WRITE;
 	<table name="t1">
 	<row>
 		<field name="a">1</field>
@@ -14,7 +12,6 @@ LOCK TABLES t1 WRITE;
 		<field name="a">2</field>
 	</row>
 	</table>
-UNLOCK TABLES;
 </database>
 </mysqldump>
 DROP TABLE t1;