Fix merge conflict by changing warning codes to new one

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` (

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'

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;

sql/share/english/errmsg.txt

@@ -259,18 +259,7 @@
 "Z_BUF_ERROR: Not enough memory available for zlib"
 "Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
 "Z_DATA_ERROR: Input data was corrupted for zlib"
-"%d line(s) was(were) cut by group_concat()"<<<<<<< local sql/share/english/errmsg.txt 1.79
-"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
-"All parts of a SPATIAL KEY must be NOT NULL"
-"COLLATION '%s' is not valid for CHARACTER SET '%s'"
-"The slave was already running"
-"The slave was already stopped"
-"Too big size of uncompressed data. The maximum size is %d. (probably, length of uncompressed data was corrupted)"
-"Z_BUF_ERROR: Not enough memory available for zlib"
-"Z_MEM_ERROR: Not enough room in the output buffer for zlib (probably, length of uncompressed data was corrupted)"
-"Z_DATA_ERROR: Input data was corrupted for zlib"
-"%d line(s) was(were) cut by group_concat()";
+"%d line(s) was(were) cut by group_concat()"
 "Record count is fewer than the column count at row %ld";
 "Record count is more than the column count at row %ld";
 "Data truncated, NULL supplied to NOT NULL column '%s' at row %ld";