Fix merge conflict by changing warning codes to new one

mysql-test/t/warnings.test:
  Fix merge conflict by changing warning code
mysql-test/r/create.result:
  Fix merge conflict
mysql-test/r/warnings.result:
  Fix merge conflict
sql/share/english/errmsg.txt:
  Fix the merge conflict

3 files changed, 3 insertions, 1 deletions

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index f5394e0ddf9..f711c8960bc 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -272,7 +272,7 @@ SELECT @@table_type;
 GEMINI
 CREATE TABLE t1 (a int not null);
 Warnings:
-Warning	1259	Using storage engine MYISAM for table 't1'
+Warning	1264	Using storage engine MYISAM for table 't1'
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index 5920c87d20a..add9051ddfb 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -109,6 +109,7 @@ Warning	1263	Data truncated for column 'b' at row 10
 select @@warning_count;
 @@warning_count
 50
+drop table t1;
 create table t1 (id int) type=isam;
 Warnings:
 Warning	1264	Using storage engine MYISAM for table 't1'
diff --git a/mysql-test/t/warnings.test b/mysql-test/t/warnings.test
index 16a9b5d11e6..6374fbf83ac 100644
--- a/mysql-test/t/warnings.test
+++ b/mysql-test/t/warnings.test
@@ -74,6 +74,7 @@ select @@warning_count;
 #
 # Test for handler type
 #
+drop table t1;
 create table t1 (id int) type=isam;
 alter table t1 type=isam;
 drop table t1;