Merge lp:~kalebral-deactivatedaccount/drizzle/change-error_num_to_enum-2 into lp:~drizzle-trunk/drizzle/development

[Lee Bieber]

Missed a few when converting from using error numbers to enum values. This will fix the embedded-innodb valgrind build in staging

[Monty Taylor (mordred)]

Looks great.

review: Approve

=== modified file 'client/errname.cc'
--- client/errname.cc	2010-01-09 00:50:53 +0000
+++ client/errname.cc	2010-08-27 21:22:40 +0000
@@ -298,7 +298,7 @@
     { "ER_WARN_TOO_MANY_RECORDS",1262 },
     { "ER_WARN_NULL_TO_NOTNULL",1263 },
     { "ER_WARN_DATA_OUT_OF_RANGE",1264 },
-    { "WARN_DATA_TRUNCATED",1265 },
+    { "ER_WARN_DATA_TRUNCATED",1265 },
     { "ER_WARN_USING_OTHER_HANDLER",1266 },
     { "ER_CANT_AGGREGATE_2COLLATIONS",1267 },
     { "ER_DROP_USER",1268 },
@@ -715,7 +715,27 @@
     { "ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN",1679 },
     { "ER_UNSUPPORTED_ACTION_ON_VIRTUAL_COLUMN",1680 },
     { "ER_CONST_EXPR_IN_VCOL",1681 },
+    { "ER_UNKNOWN_TEMPORAL_TYPE",1682 },
+    { "ER_INVALID_STRING_FORMAT_FOR_DATE",1683 },
+    { "ER_INVALID_STRING_FORMAT_FOR_TIME",1684 },
+    { "ER_INVALID_UNIX_TIMESTAMP_VALUE",1685 },
+    { "ER_INVALID_DATETIME_VALUE",1686 },
+    { "ER_INVALID_NULL_ARGUMENT",1687 },
+    { "ER_INVALID_NEGATIVE_ARGUMENT",1688 },
+    { "ER_ARGUMENT_OUT_OF_RANGE",1689 },
+    { "ER_INVALID_TIME_VALUE",1690 },
+    { "ER_INVALID_ENUM_VALUE",1691 },
     { "ER_NO_PRIMARY_KEY_ON_REPLICATED_TABLE", 1692},
+    { "ER_CORRUPT_TABLE_DEFINITION", 1693},
+    { "ER_SCHEMA_DOES_NOT_EXIST", 1694},
+    { "ER_ALTER_SCHEMA", 1695},
+    { "ER_DROP_SCHEMA", 1696},
+    { "ER_USE_SQL_BIG_RESULT", 1697},
+    { "ER_UNKNOWN_ENGINE_OPTION", 1698},
+    { "ER_UNKNOWN_SCHEMA_OPTION", 1699},
+    { "ER_EVENT_OBSERVER_PLUGIN", 1700},
+    { "ER_CORRUPT_SCHEMA_DEFINITION", 1701},
+    { "ER_CARTESIAN_JOIN_ATTEMPTED", 1702},
     { 0, 0 }
   };
 

=== modified file 'plugin/archive/tests/t/archive.test'
--- plugin/archive/tests/t/archive.test	2009-12-04 10:20:37 +0000
+++ plugin/archive/tests/t/archive.test	2010-08-27 21:22:40 +0000
@@ -1333,14 +1333,14 @@
 #
 # For bug #12836
 # Delete was allowing all rows to be removed
---error 1031
+--error ER_ILLEGAL_HA
 DELETE FROM t2;
 SELECT * FROM t2;
 INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
 INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
 INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
 SELECT * FROM t2;
---error 1031
+--error ER_ILLEGAL_HA
 TRUNCATE TABLE t2;
 SELECT * FROM t2;
 
@@ -1370,11 +1370,11 @@
 INSERT INTO t5 VALUES (NULL, "foo");
 INSERT INTO t5 VALUES (NULL, "foo");
 INSERT INTO t5 VALUES (32, "foo");
---error 1022
+--error ER_DUP_KEY
 INSERT INTO t5 VALUES (23, "foo");
 INSERT INTO t5 VALUES (NULL, "foo");
 INSERT INTO t5 VALUES (NULL, "foo");
---error 1022
+--error ER_DUP_KEY
 INSERT INTO t5 VALUES (3, "foo");
 INSERT INTO t5 VALUES (NULL, "foo");
 SELECT * FROM t5;

=== modified file 'plugin/archive/tests/t/archive_aio_posix.test'
--- plugin/archive/tests/t/archive_aio_posix.test	2009-12-04 10:20:37 +0000
+++ plugin/archive/tests/t/archive_aio_posix.test	2010-08-27 21:22:40 +0000
@@ -1333,14 +1333,14 @@
 #
 # For bug #12836
 # Delete was allowing all rows to be removed
---error 1031
+--error ER_ILLEGAL_HA
 DELETE FROM t2;
 SELECT * FROM t2;
 INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
 INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
 INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
 SELECT * FROM t2;
---error 1031
+--error ER_ILLEGAL_HA
 TRUNCATE TABLE t2;
 SELECT * FROM t2;
 
@@ -1370,11 +1370,11 @@
 INSERT INTO t5 VALUES (NULL, "foo");
 INSERT INTO t5 VALUES (NULL, "foo");
 INSERT INTO t5 VALUES (32, "foo");
---error 1022
+--error ER_DUP_KEY
 INSERT INTO t5 VALUES (23, "foo");
 INSERT INTO t5 VALUES (NULL, "foo");
 INSERT INTO t5 VALUES (NULL, "foo");
---error 1022
+--error ER_DUP_KEY
 INSERT INTO t5 VALUES (3, "foo");
 INSERT INTO t5 VALUES (NULL, "foo");
 SELECT * FROM t5;

=== modified file 'plugin/archive/tests/t/archive_discover.test'
--- plugin/archive/tests/t/archive_discover.test	2009-11-12 00:43:38 +0000
+++ plugin/archive/tests/t/archive_discover.test	2010-08-27 21:22:40 +0000
@@ -3,5 +3,5 @@
 SELECT * from t1;
 --remove_file $MYSQLTEST_VARDIR/master-data/test/t1.arz
 FLUSH TABLES;
---error 1146
+--error ER_NO_SUCH_TABLE
 SELECT * FROM t1;

=== modified file 'plugin/blackhole/tests/t/blackhole.test'
--- plugin/blackhole/tests/t/blackhole.test	2010-08-20 22:04:44 +0000
+++ plugin/blackhole/tests/t/blackhole.test	2010-08-27 21:22:40 +0000
@@ -46,12 +46,12 @@
 CREATE TABLE t5 (a int) ENGINE=BLACKHOLE;
 INSERT INTO t5 VALUES (1);
 FLUSH TABLES WITH READ LOCK;
---error 1223
+--error ER_CANT_UPDATE_WITH_READLOCK
 INSERT INTO t5 VALUES (1);
 UNLOCK TABLES;
 INSERT INTO t5 VALUES (1);
 FLUSH TABLES WITH READ LOCK;
---error 1223
+--error ER_CANT_UPDATE_WITH_READLOCK
 DROP TABLE t5;
 UNLOCK TABLES;
 INSERT INTO t5 VALUES (1);

=== modified file 'plugin/blackhole/tests/t/create_max_fields.test'
--- plugin/blackhole/tests/t/create_max_fields.test	2010-03-23 10:01:41 +0000
+++ plugin/blackhole/tests/t/create_max_fields.test	2010-08-27 21:22:40 +0000
@@ -4104,7 +4104,7 @@
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 --echo Now, MAX_FIELDS. This fails.
---error 1117
+--error ER_TOO_MANY_FIELDS
 CREATE TABLE t1 (
 f0 int,
 f1 int,

=== modified file 'plugin/blitzdb/tests/t/blitzdb-alter.test'
--- plugin/blitzdb/tests/t/blitzdb-alter.test	2010-06-09 09:52:51 +0000
+++ plugin/blitzdb/tests/t/blitzdb-alter.test	2010-08-27 21:22:40 +0000
@@ -23,9 +23,9 @@
   primary key (pk)
 ) ENGINE=blitzdb ;
 
---error 1112
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE `t1` DISABLE KEYS;
---error 1112
+--error ER_UNSUPPORTED_EXTENSION
 ALTER TABLE `t1` ENABLE KEYS;
 
 DROP TABLE `t1`;

=== modified file 'plugin/blitzdb/tests/t/blitzdb-basic.test'
--- plugin/blitzdb/tests/t/blitzdb-basic.test	2010-07-13 06:12:40 +0000
+++ plugin/blitzdb/tests/t/blitzdb-basic.test	2010-08-27 21:22:40 +0000
@@ -8,13 +8,13 @@
 create table t1 (a int, b double, c float) engine = blitzdb;
 create table t2 (a int, b text, c blob) engine = blitzdb;
 
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 create table t1 (a int, b double, c float) engine = blitzdb;
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 create table t2 (a int, b text, c blob) engine = blitzdb;
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 create table t1 (a int) engine = blitzdb;
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 create table t2 (a int) engine = blitzdb;
 
 show tables;
@@ -136,7 +136,7 @@
 insert into t1 values (1, NULL), (2, NULL), (3, NULL), (4, NULL);
 insert into t1 values (5, NULL), (6, NULL), (7, NULL), (8, NULL);
 
---error 1048 # NOT NULL Violation
+--error ER_BAD_NULL_ERROR # NOT NULL Violation
 insert into t1 values (NULL, 1);
 
 select * from t1;
@@ -162,9 +162,9 @@
 
 # Test(12): Boundary Check
 create table t1 (a int) engine = blitzdb;
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t1 values(2147483649);
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t1 values(-2147483649);
 insert into t1 values(2147483647);
 select * from t1;
@@ -177,13 +177,13 @@
 insert into t1 select repeat('x', 8);
 insert into t1 select repeat('x', 16);
 insert into t1 select repeat('x', 32);
---error 1406
+--error ER_DATA_TOO_LONG
 insert into t1 select repeat('x', 33);
 select * from t1;
 
 create table t2 (a varchar(16383)) engine = blitzdb; # Theoretical Max
 insert into t2 select repeat('x', 16383);
---error 1406
+--error ER_DATA_TOO_LONG
 insert into t2 select repeat('x', 16384);
 select count(*) from t2;
 drop table t1, t2;
@@ -192,13 +192,13 @@
 create table t1 (a varchar(32)) engine = blitzdb; 
 insert into t1 select repeat('�', 8);
 insert into t1 select repeat('�', 32);
---error 1406
+--error ER_DATA_TOO_LONG
 insert into t1 select repeat('�', 33);
 select * from t1;
 
 create table t2 (a varchar(16383)) engine = blitzdb;
 insert into t2 select repeat('値', 16383);
---error 1406
+--error ER_DATA_TOO_LONG
 insert into t2 select repeat('値', 16384);
 select count(*) from t2;
 drop table t1, t2;

=== modified file 'plugin/blitzdb/tests/t/blitzdb-decimal.test'
--- plugin/blitzdb/tests/t/blitzdb-decimal.test	2010-06-02 09:39:56 +0000
+++ plugin/blitzdb/tests/t/blitzdb-decimal.test	2010-08-27 21:22:40 +0000
@@ -18,19 +18,19 @@
 # Test the max number of possible digits
 create table t2 (a decimal(65,0)) engine = blitzdb;
 insert into t2 select repeat(1, 65);
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t2 select repeat(1, 66);
 select * from t2;
 drop table t2;
 
 create table t2 (a decimal(65,8)) engine = blitzdb;
 insert into t2 select repeat(1, 57);
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t2 select repeat(1, 58);
 
 delete from t2;
 
---error 1264 # Out of Range
+--error ER_WARN_DATA_OUT_OF_RANGE # Out of Range
 insert into t2 values (
   -1111111111111111111111111111111111111111111111111111111111
 );
@@ -39,7 +39,7 @@
   1111111111111111111111111111111111111111111111111.11111111
 );
 
---error 1265 # Truncated
+--error ER_WARN_DATA_TRUNCATED # Truncated
 insert into t2 values (
   111111111111111111111111111111111111111111111111.111111111
 );
@@ -94,11 +94,11 @@
 
 # Exponent overflow bug
 create table t1 (a decimal(10,0)) engine = blitzdb;
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("1e4294967295");
 select * from t1;
 delete from t1;
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values("1e4294967297");
 select * from t1;
 drop table t1;

=== modified file 'plugin/blitzdb/tests/t/blitzdb-index.test'
--- plugin/blitzdb/tests/t/blitzdb-index.test	2010-07-13 06:12:40 +0000
+++ plugin/blitzdb/tests/t/blitzdb-index.test	2010-08-27 21:22:40 +0000
@@ -18,17 +18,17 @@
 explain select count (*) from t1;
 
 # overflow
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t1 values (2147483648, 1, 1);
 
 # duplicates 
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values (1, 0, 0);
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values (2, 0, 0);
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values (3, 0, 0);
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values (4, 0, 0);
 
 # needle in a haystack 
@@ -42,7 +42,7 @@
 select * from t1 order by id;
 
 # update the key
---error 1062
+--error ER_DUP_ENTRY
 update t1 set id = 2 where id = 1;
 
 update t1 set id = 17 where id = 1;
@@ -53,7 +53,7 @@
 update t1 set id = 22 where id = 6;
 update t1 set id = 23 where id = 7;
 
---error 1062
+--error ER_DUP_ENTRY
 update t1 set id = 20 where id = 8;
 
 # TODO: This is using filesort. Investigate why.
@@ -100,12 +100,12 @@
 insert into t1 values (1.8e+18, 2);
 
 # overflow
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t1 values (1.8e+19, 3);
 
 insert into t1 values (1,1), (2,2), (3,3), (4,4);
 
---error 1062
+--error ER_DUP_ENTRY
 update t1 set id = 4 where id = 1;
 
 update t1 set id = 10 where id = 1;
@@ -183,9 +183,9 @@
 insert into t1 values (2.2222, 8);
 select * from t1;
 
---error 1062
+--error ER_DUP_ENTRY
 update t1 set id = 1.11 where id = 1.1;
---error 1062
+--error ER_DUP_ENTRY
 update t1 set id = 2.22 where id = 2.2;
 
 update t1 set id = 3.3 where id = 1.1;
@@ -194,7 +194,7 @@
 update t1 set id = 3.3333 where id = 1.1111;
 select * from t1 order by id;
 
---error 1062
+--error ER_DUP_ENTRY
 update t1 set id = 2.2 where id = 3.3;
 
 delete from t1 where id = 3.3;
@@ -225,7 +225,7 @@
 select country from t1 where id = 'budapest';
 select count (id) from t1;
 
---error 1062
+--error ER_DUP_ENTRY
 update t1 set id = 'dublin' where id = 'geneva';
 update t1 set id = 'berlin', country = 'germany' where id = 'budapest';
 update t1 set id = 'london', country = 'england' where id = 'copenhagen';
@@ -263,9 +263,9 @@
 delete from t1 where a = 'hhh';
 select * from t1;
 
---error 1062
+--error ER_DUP_ENTRY
 update t1 set a = 'ddd' where a = 'aaa';
---error 1062
+--error ER_DUP_ENTRY
 update t1 set a = 'ccc' where a = 'bbb';
 
 update t1 set a = 'zzz' where a = 'fff';
@@ -289,9 +289,9 @@
 select * from t1 where a = '1984-09-24';
 select * from t1 where a = '1984-09-25';
 
---error 1062
+--error ER_DUP_ENTRY
 update t1 set a = '1984-09-22' where a = '1984-09-25';
---error 1062
+--error ER_DUP_ENTRY
 update t1 set a = '19840922' where a = '1984-09-25';
 
 update t1 set a = '2010-03-10' where a = '1984-09-22';
@@ -384,9 +384,9 @@
 create table t1 (a int, unique index(a)) engine = blitzdb;
 insert into t1 values (1), (2);
 
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values (1);
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values (2);
 
 insert into t1 values (NULL);
@@ -404,11 +404,11 @@
 create table t1 (a varchar(32), unique index(a)) engine = blitzdb;
 insert into t1 values ('a'), ('b'), ('c');
 
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values ('a');
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values ('b');
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values ('c');
 
 insert into t1 values ('f'), ('e'), ('d');
@@ -484,7 +484,7 @@
 select * from t1;
 select * from t1 where a is NULL;
 insert into t1 values (1, 5), (2, 6);
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values (1, 7), (1, 8);
 select * from t1 where a is not NULL;
 delete from t1 where a is NULL;
@@ -522,17 +522,17 @@
 # | COMPOSITE INDEX CHECK |
 # +-----------------------+
 
---error 1005
+--error ER_CANT_CREATE_TABLE
 create table t1 (a int, b int, c int, d int, primary key(a, b)) engine = blitzdb;
---error 1005
+--error ER_CANT_CREATE_TABLE
 create table t1 (a int, b int, c int, d int, primary key(a, b, c)) engine = blitzdb;
---error 1005
+--error ER_CANT_CREATE_TABLE
 create table t1 (a int, b int, c int, d int, index(a, b)) engine = blitzdb;
---error 1005
+--error ER_CANT_CREATE_TABLE
 create table t1 (a int, b int, c int, d int, index(a, b, c)) engine = blitzdb;
---error 1005
+--error ER_CANT_CREATE_TABLE
 create table t1 (a int, b int, c int, d int, unique(a, b)) engine = blitzdb;
---error 1005
+--error ER_CANT_CREATE_TABLE
 create table t1 (a int, b int, c int, d int, unique(a, b, c)) engine = blitzdb;
 
 # +------------------------------------------+

=== modified file 'plugin/csv/tests/t/csv.test'
--- plugin/csv/tests/t/csv.test	2009-11-12 00:44:36 +0000
+++ plugin/csv/tests/t/csv.test	2010-08-27 21:22:40 +0000
@@ -1472,22 +1472,22 @@
 # Bug #31473: does not work with NULL value in datetime field
 #
 create temporary table t1(a datetime not null) engine=csv;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 insert into t1 values();
 select * from t1;
 drop table t1;
 create temporary table t1(a varchar(32) not null) engine=csv;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 insert into t1 values();
 select * from t1;
 drop table t1;
 create temporary table t1(a int not null) engine=csv;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 insert into t1 values();
 select * from t1;
 drop table t1;
 create temporary table t1(a blob not null) engine=csv;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 insert into t1 values();
 select * from t1;
 drop table t1;

=== modified file 'plugin/csv/tests/t/csv_not_null.test'
--- plugin/csv/tests/t/csv_not_null.test	2009-11-12 00:44:36 +0000
+++ plugin/csv/tests/t/csv_not_null.test	2010-08-27 21:22:40 +0000
@@ -42,7 +42,7 @@
 CREATE TEMPORARY TABLE t1 (a int NOT NULL, b blob NOT NULL, c CHAR(20) NOT NULL, 
 d VARCHAR(20) NOT NULL, e enum('foo','bar') NOT NULL,f DATE NOT NULL) 
 ENGINE = CSV;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 INSERT INTO t1 VALUES();
 SELECT * FROM t1;
 
@@ -73,7 +73,7 @@
 
 
 CREATE TEMPORARY TABLE t1 (a int NOT NULL, b char(10) NOT NULL) ENGINE = CSV;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 INSERT INTO t1 VALUES();
 insert into t1 values (0,"");
 SELECT * FROM t1;

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_column_drop_default.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_column_drop_default.test	2010-05-13 14:10:16 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_column_drop_default.test	2010-08-27 21:22:40 +0000
@@ -2,7 +2,7 @@
 INSERT INTO t1 values ();
 SELECT * FROM t1;
 ALTER TABLE t1 ALTER COLUMN a DROP DEFAULT;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 INSERT INTO t1 values ();
 INSERT INTO t1 (a) VALUES (11);
 SELECT * FROM t1 ORDER BY a;

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table.test	2010-08-04 02:11:50 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/alter_table.test	2010-08-27 21:22:40 +0000
@@ -522,11 +522,11 @@
 #create table t1(f1 int);
 #alter table t1 add column f2 datetime not null, add column f21 date not null;
 #insert into t1 values(1,'2000-01-01','2000-01-01');
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #alter table t1 add column f3 datetime not null;
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #alter table t1 add column f3 date not null;
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #alter table t1 add column f4 datetime not null default '2002-02-02',
 #  add column f41 date not null;
 #alter table t1 add column f4 datetime not null default '2002-02-02',

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment.test	2010-04-21 02:30:12 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/auto_increment.test	2010-08-27 21:22:40 +0000
@@ -110,7 +110,7 @@
 select last_insert_id();
 insert into t1 values (NULL, 15);
 select last_insert_id();
---error ER_DUP_ENTRY,1022
+--error ER_DUP_ENTRY, ER_DUP_KEY
 insert into t1 values (NULL, 10);
 select last_insert_id();
 
@@ -140,7 +140,7 @@
 update t1 set a=0 where b=5;
 select * from t1 order by b;
 delete from t1 where a=0;
---error 1048
+--error ER_BAD_NULL_ERROR
 update t1 set a=NULL where b=6;
 update t1 set a=300 where b=7;
 insert into t1(a,b)values(NULL,8);
@@ -155,7 +155,7 @@
 update t1 set a=0 where b=12;
 select * from t1 order by b;
 delete from t1 where a=0;
---error 1048
+--error ER_BAD_NULL_ERROR
 update t1 set a=NULL where b=13;
 update t1 set a=500 where b=14;
 select * from t1 order by b;
@@ -173,7 +173,7 @@
 
 create table t1 (a bigint, b int auto_increment primary key);
 insert into t1 (a) values (1), (2), (3), (0), (0);
---error 1022,1062
+--error ER_DUP_KEY, ER_DUP_ENTRY
 alter table t1 drop column b, modify a bigint not null auto_increment primary key; 
 select * from t1;
 drop table t1;
@@ -202,7 +202,7 @@
 select * from t1;
 #set sql_mode= '';
 alter table t1 modify b varchar(255);
---error 1022,1062
+--error ER_DUP_KEY, ER_DUP_ENTRY
 insert into t1 values (0,4);
 select * from t1;
 drop table t1;
@@ -302,7 +302,7 @@
 INSERT INTO t1 VALUES(0, 0);
 INSERT INTO t1 VALUES(1, 1);
 ALTER TABLE t1 CHANGE t1 t1 INT auto_increment;
---error 1022, ER_DUP_ENTRY
+--error ER_DUP_KEY,  ER_DUP_ENTRY
 INSERT INTO t1 VALUES(0,0);
 DROP TABLE t1;
 

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_nullable.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_nullable.test	2010-04-06 06:52:59 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_nullable.test	2010-08-27 21:22:40 +0000
@@ -1,9 +1,9 @@
 create table t1 (a int, b int not null, c int null, d int not null, pk int primary key);
 show create table t1;
 insert into t1 values (0,0, 0, 0,0);
---error 1048
+--error ER_BAD_NULL_ERROR
 insert into t1 values (NULL, NULL, NULL, NULL, 1);
 insert into t1 values (NULL, 1, NULL, 1, 2);
---error 1048
+--error ER_BAD_NULL_ERROR
 insert into t1 values (1,2,3,NULL, 3);
 drop table t1;

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_table.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_table.test	2010-04-28 02:53:17 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_create_table.test	2010-08-27 21:22:40 +0000
@@ -1,6 +1,6 @@
 CREATE TABLE t1 (a int primary key);
 SHOW CREATE TABLE t1;
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 CREATE TABLE t1 (a int primary key);
 CREATE TABLE t2 (a int primary key, b varchar(20), c bigint);
 

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_drop_table.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_drop_table.test	2010-04-06 06:52:59 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_drop_table.test	2010-08-27 21:22:40 +0000
@@ -2,6 +2,6 @@
 CREATE TABLE t2 (a int primary key);
 DROP TABLE t1;
 DROP TABLE t2;
---error 1051
+--error ER_BAD_TABLE_ERROR
 DROP TABLE t3;
 

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_pkey_duplicate.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_pkey_duplicate.test	2010-02-24 01:42:24 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_pkey_duplicate.test	2010-08-27 21:22:40 +0000
@@ -1,5 +1,5 @@
 create table t1 (a int primary key);
 insert into t1 values (1);
---error 1022
+--error ER_DUP_KEY
 insert into t1 values (1);
 drop table t1;

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_statement_rollback.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_statement_rollback.test	2010-03-11 05:13:23 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_statement_rollback.test	2010-08-27 21:22:40 +0000
@@ -3,7 +3,7 @@
 select * from t1;
 begin;
 insert into t1 values (5);
---error 1022,1062
+--error ER_DUP_KEY,  ER_DUP_ENTRY
 insert into t1 values (1),(2),(3),(4);
 commit;
 select * from t1;

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/comments.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/comments.test	2010-06-09 04:35:15 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/comments.test	2010-08-27 21:22:40 +0000
@@ -5,7 +5,7 @@
 select 1+2/*hello*/+3;
 select 1 /* long
 multi line comment */;
---error 1065
+--error ER_EMPTY_QUERY
  ;
 select 1 /*!32301 +1 */;
 select 1 /*!72301 +1 */;

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format.test	2010-05-05 02:33:31 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_format.test	2010-08-27 21:22:40 +0000
@@ -6,7 +6,7 @@
 SET GLOBAL innodb_file_format='barracuda';
 SHOW VARIABLES LIKE 'innodb_file_format';
 SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';
---error 1210
+--error ER_WRONG_ARGUMENTS
 SET GLOBAL innodb_file_format='broccolini';
 SHOW VARIABLES LIKE 'innodb_file_format';
 SELECT * FROM DATA_DICTIONARY.INNODB_CONFIGURATION WHERE NAME='file_format';

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_length_limit.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_length_limit.test	2010-06-21 05:39:42 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_length_limit.test	2010-08-27 21:22:40 +0000
@@ -1,4 +1,4 @@
 CREATE TABLE t1 (pk int primary key, a varbinary(767) unique);
 drop table t1;
---error 1071
+--error ER_TOO_LONG_KEY
 CREATE TABLE t1 (pk int primary key, a varbinary(4097) unique);

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_prefix.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_prefix.test	2010-06-21 05:01:48 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/index_prefix.test	2010-08-27 21:22:40 +0000
@@ -1,12 +1,12 @@
 create table t1 (a int primary key, b varchar(111), unique index b_idx (b(5)));
 insert into t1 values (1, "foobar"),(2,"barbarbar");
---error 1062,1022
+--error ER_DUP_ENTRY, ER_DUP_KEY
 insert into t1 values (3, "barbarpub");
 select * from t1;
 drop table t1;
 create table t2 (a int primary key, b varbinary(111), unique index b_idx (b(5)));
 insert into t2 values (1, "foobar"),(2,"barbarbar");
---error 1062,1022
+--error ER_DUP_ENTRY, ER_DUP_KEY
 insert into t2 values (3, "barbarpub");
 select * from t2;
 drop table t2;

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rename.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rename.test	2010-04-06 06:52:59 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/rename.test	2010-08-27 21:22:40 +0000
@@ -19,14 +19,14 @@
 select * from t1;
 
 # The following should give errors
---error 1050,1050
+--error ER_TABLE_EXISTS_ERROR, ER_TABLE_EXISTS_ERROR
 rename table t1 to t2;
---error 1050,1050
+--error ER_TABLE_EXISTS_ERROR, ER_TABLE_EXISTS_ERROR
 rename table t1 to t1;
---error 1050,1050
+--error ER_TABLE_EXISTS_ERROR, ER_TABLE_EXISTS_ERROR
 rename table t3 to t4, t2 to t3, t1 to t2, t4 to t2;
 show tables like "t_";
---error 1050,1050
+--error ER_TABLE_EXISTS_ERROR, ER_TABLE_EXISTS_ERROR
 rename table t3 to t1, t2 to t3, t1 to t2, t4 to t1;
 --error ER_NO_SUCH_TABLE
 rename table t3 to t4, t5 to t3, t1 to t2, t4 to t1;

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/replace.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/replace.test	2010-05-11 04:27:51 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/replace.test	2010-08-27 21:22:40 +0000
@@ -12,7 +12,7 @@
 
 create table t1 (a int not null auto_increment primary key, b char(20) default "default_value");
 insert into t1 values (126,"first"),(63, "middle"),(1,"last");
---error ER_DUP_ENTRY,1022
+--error ER_DUP_ENTRY, ER_DUP_KEY
 insert into t1 values (1,"error");
 replace into t1 values (1,"error");
 replace into t1 values (126,"first updated");

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format.test	2010-06-07 08:46:37 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format.test	2010-08-27 21:22:40 +0000
@@ -1,4 +1,4 @@
---error 1005
+--error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 (a int) ENGINE=INNODB ROW_FORMAT=COMPRESSED;
 SHOW WARNINGS;
 

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/truncate.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/truncate.test	2010-04-27 13:00:14 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/truncate.test	2010-08-27 21:22:40 +0000
@@ -15,14 +15,14 @@
 select * from t1;
 drop table t1;
 # The following should fail
---error 1146
+--error ER_NO_SUCH_TABLE
 select count(*) from t1;
 create table t1 (n int primary key);
 insert into t1 values (1),(2),(3);
 truncate table t1;
 select * from t1;
 drop table t1;
---error 1146
+--error ER_NO_SUCH_TABLE
 truncate non_existing_table;
 
 #

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob.test	2010-05-26 14:53:47 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_blob.test	2010-08-27 21:22:40 +0000
@@ -31,13 +31,13 @@
 # Check errors with blob
 #
 
---error 1101
+--error ER_BLOB_CANT_HAVE_DEFAULT
 CREATE TABLE t1 (a blob default "hello");
 CREATE TABLE t2 (a varchar(256));
 drop table t2;
---error 1074
+--error ER_TOO_BIG_FIELDLENGTH
 CREATE TABLE t1 (a varchar(70000) default "hello");
---error 1101
+--error ER_BLOB_CANT_HAVE_DEFAULT
 CREATE TABLE t2 (a blob default "hello");
 
 # Safety to be able to continue with other tests if above fails

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_date.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_date.test	2010-04-28 02:30:54 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_date.test	2010-08-27 21:22:40 +0000
@@ -118,7 +118,7 @@
 select @d:=011111;
 select year(@d), month(@d), day(@d), cast(@d as date);
 select @d:=1311;
---error 1686 # Invalid datetime of 1311
+--error ER_INVALID_DATETIME_VALUE # Invalid datetime of 1311
 select year(@d), month(@d), day(@d), cast(@d as date);
 create table t1 (d  date , dt datetime , ts timestamp, primary key (d));
 -- error 1686 # Bad dates

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_datetime.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_datetime.test	2010-04-28 02:52:03 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_datetime.test	2010-08-27 21:22:40 +0000
@@ -19,12 +19,12 @@
 insert into t1 (t) values (991231235959);
 insert into t1 (t) values (10000101000000);
 insert into t1 (t) values (99991231235959);
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values (20030100000000);
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values (20030000000000);
 select t from t1;
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 delete from t1 where t > 0;
 # try earliest datetime end point which is actually a friggin datetime, not a 0.
 delete from t1 where t > "0001-01-01 00:00:00";
@@ -35,40 +35,40 @@
 insert into t1 (t) values("691231");
 insert into t1 (t) values("700101");
 insert into t1 (t) values("991231");
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values("00000101");
 insert into t1 (t) values("00010101");
 insert into t1 (t) values("99991231");
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values("00101000000");
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values("691231000000");
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values("700101000000");
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values("991231235959");
 insert into t1 (t) values("10000101000000");
 insert into t1 (t) values("99991231235959");
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values("20030100000000");
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values("20030000000000");
 
 # Strange dates
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values ("2003-003-03");
 
 # Bug #7308: ISO-8601 date format not handled correctly
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values ("20030102T131415");
 insert into t1 (t) values ("2001-01-01T01:01:01");
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values ("2001-1-1T1:01:01");
 select t from t1;
 
 # Test some wrong dates
 truncate table t1;
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 (t) values("2003-0303 12:13:14");
 select t from t1;
 drop table t1;
@@ -124,18 +124,18 @@
 # warnings (for both strings and numbers)
 #
 create table t1 (t datetime primary key);
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 values (20030102030460),(20030102036301),(20030102240401),
                       (20030132030401),(20031302030401),(100001202030401);
 select * from t1;
 delete from t1;
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 values
   ("2003-01-02 03:04:60"),("2003-01-02 03:63:01"),("2003-01-02 24:04:01"),
   ("2003-01-32 03:04:01"),("2003-13-02 03:04:01"), ("10000-12-02 03:04:00");
 select * from t1;
 delete from t1;
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 insert into t1 values ("0000-00-00 00:00:00 some trailer"),("2003-01-01 00:00:00 some trailer");
 select * from t1 order by t;
 drop table t1;
@@ -148,7 +148,7 @@
 # These dates should be treated as dates in 21st century
 insert into t1 values ("12-01-01"), ("01-01-01 01:00:00");
 # Zero dates are still special :/
---error 1686 # Yeah special uh no its wrong
+--error ER_INVALID_DATETIME_VALUE # Yeah special uh no its wrong
 insert into t1 values ("00-00-00"), ("00-00-00 00:00:00");
 select * from t1;
 drop table t1;
@@ -190,11 +190,11 @@
 insert into t1 (da, dt) values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
 insert into t1 set dt='2007-03-23 13:49:38',da=dt;
 # Test error handling
---error 1686 # Bad date
+--error ER_INVALID_DATETIME_VALUE # Bad date
 insert into t1 (da, dt) values ('2007-03-32','2007-03-23 13:49:38');
 select da,dt from t1;
 drop table t1;
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 create table t1 (da date default '1962-03-32 23:33:34', dt datetime default '1962-03-03', pk int auto_increment primary key);
 
 
@@ -273,9 +273,9 @@
 create table t1(f1 datetime primary key);
 insert into t1 values('2001-01-01'),('2002-02-02');
 select * from t1 where f1 between 20020101 and 20070101000000;
---error 1686 # 2002010 is not a datetime.
+--error ER_INVALID_DATETIME_VALUE # 2002010 is not a datetime.
 select * from t1 where f1 between 2002010 and 20070101000000;
---error 1686 # 2007010100000 is not a datetime.
+--error ER_INVALID_DATETIME_VALUE # 2007010100000 is not a datetime.
 select * from t1 where f1 between 20020101 and 2007010100000;
 drop table t1;
 
@@ -330,9 +330,9 @@
 insert into t1 (da, dt) values ('2007-03-23 13:49:38','2007-03-23 13:49:38');
 insert into t1 set dt='2007-03-23 13:49:38',da=dt;
 # Test error handling
---error 1686 # Bad date
+--error ER_INVALID_DATETIME_VALUE # Bad date
 insert into t1 (da, dt) values ('2007-03-32','2007-03-23 13:49:38');
 select da,dt from t1;
 drop table t1;
---error 1686 # Bad date
+--error ER_INVALID_DATETIME_VALUE # Bad date
 create table t1 (da date default '1962-03-32 23:33:34', dt datetime default '1962-03-03' primary key);

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_decimal.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_decimal.test	2010-05-27 06:09:12 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_decimal.test	2010-08-27 21:22:40 +0000
@@ -174,59 +174,59 @@
 insert into t1 values ("00000000000001");
 insert into t1 values ("+0000000000001");
 insert into t1 values ("-0000000000001");
---error 1264 out of range value
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
 insert into t1 values ("+111111111.11"),("111111111.11"),("-11111111.11");
---error 1264 out of range value
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
 insert into t1 values ("-111111111.11"),("+1111111111.11"),("1111111111.11");
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("1e+1000");
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("1e-1000");
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("-1e+1000");
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("1e+4294967296");
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("1e-4294967296");
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("1e+18446744073709551615");
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("1e+18446744073709551616");
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("1e-9223372036854775807");
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("1e-9223372036854775809");
---error 1366 incorrect decimal value
-insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
-select * from t1;
-drop  table t1;
-
-create table t1 (a decimal(10,2));
-insert into t1 values ("0.0"),("-0.0"),("+0.0"),("01.0"),("+01.0"),("-01.0");
-insert into t1 values ("-.1"),("+.1"),(".1");
-insert into t1 values ("00000000000001"),("+0000000000001"),("-0000000000001");
---error 1264 out of range value
-insert into t1 values ("+111111111.11"),("111111111.11"),("-11111111.11");
---error 1264 out of range value
-insert into t1 values ("-111111111.11"),("+1111111111.11"),("1111111111.11");
---error 1366 incorrect decimal value
-insert into t1 values ("1e+1000"),("1e-1000"),("-1e+1000");
---error 1366 incorrect decimal value
-insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
-select * from t1;
-drop  table t1;
-
-create table t1 (a decimal(10,2));
-insert into t1 values ("0.0"),("-0.0"),("+0.0"),("01.0"),("+01.0"),("-01.0");
-insert into t1 values ("-.1"),("+.1"),(".1");
-insert into t1 values ("00000000000001"),("+0000000000001"),("-0000000000001");
---error 1264 out of range value
-insert into t1 values ("+111111111.11"),("111111111.11"),("-11111111.11");
---error 1264 out of range value
-insert into t1 values ("-111111111.11"),("+1111111111.11"),("1111111111.11");
---error 1366 incorrect decimal value
-insert into t1 values ("1e+1000"),("1e-1000"),("-1e+1000");
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
+insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
+select * from t1;
+drop  table t1;
+
+create table t1 (a decimal(10,2));
+insert into t1 values ("0.0"),("-0.0"),("+0.0"),("01.0"),("+01.0"),("-01.0");
+insert into t1 values ("-.1"),("+.1"),(".1");
+insert into t1 values ("00000000000001"),("+0000000000001"),("-0000000000001");
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
+insert into t1 values ("+111111111.11"),("111111111.11"),("-11111111.11");
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
+insert into t1 values ("-111111111.11"),("+1111111111.11"),("1111111111.11");
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
+insert into t1 values ("1e+1000"),("1e-1000"),("-1e+1000");
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
+insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
+select * from t1;
+drop  table t1;
+
+create table t1 (a decimal(10,2));
+insert into t1 values ("0.0"),("-0.0"),("+0.0"),("01.0"),("+01.0"),("-01.0");
+insert into t1 values ("-.1"),("+.1"),(".1");
+insert into t1 values ("00000000000001"),("+0000000000001"),("-0000000000001");
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
+insert into t1 values ("+111111111.11"),("111111111.11"),("-11111111.11");
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
+insert into t1 values ("-111111111.11"),("+1111111111.11"),("1111111111.11");
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
+insert into t1 values ("1e+1000"),("1e-1000"),("-1e+1000");
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("123.4e"),("123.4e+2"),("123.4e-2"),("123e1"),("123e+0");
 select * from t1;
 drop  table t1;
@@ -237,18 +237,18 @@
 insert into t1 values (0.0),("-0.0"),(+0.0),(01.0),(+01.0),(-01.0);
 insert into t1 values (-.1),(+.1),(.1);
 insert into t1 values (00000000000001),(+0000000000001),(-0000000000001);
---error 1264 out of range value
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
 insert into t1 values (+111111111.11),(111111111.11),(-11111111.11);
---error 1264 out of range value
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
 insert into t1 values (-111111111.11),(+1111111111.11),(1111111111.11);
---error 1264 out of range value
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
 insert into t1 values (1e+100),(1e-100),(-1e+100);
 insert into t1 values (123.4e0);
 insert into t1 values (123.4e+2);
 # This INSERT statement will give an error since truncation of a
 # decimal number in Drizzle is an error. See bug#337038 for further
 # details.
---error 1265
+--error ER_WARN_DATA_TRUNCATED
 insert into t1 values (123.4e-2);
 insert into t1 values (123e1);
 insert into t1 values (123e+0);
@@ -263,33 +263,33 @@
 #
 
 create table t1 (a decimal);
---error 1264 out of range value
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
 insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('[phone]'),(99999999999999);
 select * from t1;
 drop  table t1;
 create table t1 (a decimal);
---error 1264 out of range value
-insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('[phone]'),(99999999999999);
-select * from t1;
-drop  table t1;
-create table t1 (a decimal);
---error 1264 out of range value
-insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('[phone]'),(99999999999999);
-select * from t1;
-drop  table t1;
-create table t1 (a decimal);
---error 1264 out of range value
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
+insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('[phone]'),(99999999999999);
+select * from t1;
+drop  table t1;
+create table t1 (a decimal);
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
+insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('[phone]'),(99999999999999);
+select * from t1;
+drop  table t1;
+create table t1 (a decimal);
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
 insert into t1 values (-99999999999999),(-1),('+1'),('01'),('+00000000000001'),('[phone]'),(99999999999999);
 select * from t1;
 drop  table t1;
 
 #  Exponent overflow bug
 create table t1(a decimal(10,0));
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values ("1e4294967295");
 select * from t1;
 delete from t1;
---error 1366 incorrect decimal value
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD incorrect decimal value
 insert into t1 values("1e4294967297");
 select * from t1;
 drop table t1;
@@ -298,13 +298,13 @@
 # Test of wrong decimal type
 #
 
---error 1064
+--error ER_PARSE_ERROR
 CREATE TABLE t1 (a_dec DECIMAL(-1,0));
---error 1064
+--error ER_PARSE_ERROR
 CREATE TABLE t1 (a_dec DECIMAL(-2,1));
---error 1064
+--error ER_PARSE_ERROR
 CREATE TABLE t1 (a_dec DECIMAL(-1,1));
---error 1427
+--error ER_M_BIGGER_THAN_D
 CREATE TABLE t1 (a_dec DECIMAL(0,11));
 
 #
@@ -312,17 +312,17 @@
 #
 --disable_warnings
 create table t1(a decimal(7,3));
---error 1264 out of range value
-insert into t1 values ('1'),('+1'),('-1'),('0000000001'),('+0000000001'),('-0000000001'),('10'),('+10'),('-10'),('0000000010'),('+0000000010'),('-0000000010'),('100'),('+100'),('-100'),('0000000100'),('+0000000100'),('-0000000100'),('1000'),('+1000'),('-1000'),('0000001000'),('+0000001000'),('-0000001000'),('10000'),('+10000'),('-10000'),('0000010000'),('+0000010000'),('-0000010000'),('100000'),('+100000'),('-100000'),('0000100000'),('+0000100000'),('-0000100000'),('1000000'),('+1000000'),('-1000000'),('0001000000'),('+0001000000'),('-0001000000'),('10000000'),('[phone]'),('-10000000'),('0010000000'),('+0010000000'),('-0010000000'),('100000000'),('[phone]'),('-100000000'),('0100000000'),('+0100000000'),('-0100000000'),('1000000000'),('[phone]'),('-1000000000'),('1000000000'),('[phone]'),('-1000000000');
-select * from t1;
-drop table t1;
-create table t1(a decimal(7,3));
---error 1264 out of range value
-insert into t1 values ('1'),('+1'),('-1'),('0000000001'),('+0000000001'),('-0000000001'),('10'),('+10'),('-10'),('0000000010'),('+0000000010'),('-0000000010'),('100'),('+100'),('-100'),('0000000100'),('+0000000100'),('-0000000100'),('1000'),('+1000'),('-1000'),('0000001000'),('+0000001000'),('-0000001000'),('10000'),('+10000'),('-10000'),('0000010000'),('+0000010000'),('-0000010000'),('100000'),('+100000'),('-100000'),('0000100000'),('+0000100000'),('-0000100000'),('1000000'),('+1000000'),('-1000000'),('0001000000'),('+0001000000'),('-0001000000'),('10000000'),('[phone]'),('-10000000'),('0010000000'),('+0010000000'),('-0010000000'),('100000000'),('[phone]'),('-100000000'),('0100000000'),('+0100000000'),('-0100000000'),('1000000000'),('[phone]'),('-1000000000'),('1000000000'),('[phone]'),('-1000000000');
-select * from t1;
-drop table t1;
-create table t1(a decimal(7,3));
---error 1264 out of range value
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
+insert into t1 values ('1'),('+1'),('-1'),('0000000001'),('+0000000001'),('-0000000001'),('10'),('+10'),('-10'),('0000000010'),('+0000000010'),('-0000000010'),('100'),('+100'),('-100'),('0000000100'),('+0000000100'),('-0000000100'),('1000'),('+1000'),('-1000'),('0000001000'),('+0000001000'),('-0000001000'),('10000'),('+10000'),('-10000'),('0000010000'),('+0000010000'),('-0000010000'),('100000'),('+100000'),('-100000'),('0000100000'),('+0000100000'),('-0000100000'),('1000000'),('+1000000'),('-1000000'),('0001000000'),('+0001000000'),('-0001000000'),('10000000'),('[phone]'),('-10000000'),('0010000000'),('+0010000000'),('-0010000000'),('100000000'),('[phone]'),('-100000000'),('0100000000'),('+0100000000'),('-0100000000'),('1000000000'),('[phone]'),('-1000000000'),('1000000000'),('[phone]'),('-1000000000');
+select * from t1;
+drop table t1;
+create table t1(a decimal(7,3));
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
+insert into t1 values ('1'),('+1'),('-1'),('0000000001'),('+0000000001'),('-0000000001'),('10'),('+10'),('-10'),('0000000010'),('+0000000010'),('-0000000010'),('100'),('+100'),('-100'),('0000000100'),('+0000000100'),('-0000000100'),('1000'),('+1000'),('-1000'),('0000001000'),('+0000001000'),('-0000001000'),('10000'),('+10000'),('-10000'),('0000010000'),('+0000010000'),('-0000010000'),('100000'),('+100000'),('-100000'),('0000100000'),('+0000100000'),('-0000100000'),('1000000'),('+1000000'),('-1000000'),('0001000000'),('+0001000000'),('-0001000000'),('10000000'),('[phone]'),('-10000000'),('0010000000'),('+0010000000'),('-0010000000'),('100000000'),('[phone]'),('-100000000'),('0100000000'),('+0100000000'),('-0100000000'),('1000000000'),('[phone]'),('-1000000000'),('1000000000'),('[phone]'),('-1000000000');
+select * from t1;
+drop table t1;
+create table t1(a decimal(7,3));
+--error ER_WARN_DATA_OUT_OF_RANGE out of range value
 insert into t1 values ('1'),('+1'),('-1'),('0000000001'),('+0000000001'),('-0000000001'),('10'),('+10'),('-10'),('0000000010'),('+0000000010'),('-0000000010'),('100'),('+100'),('-100'),('0000000100'),('+0000000100'),('-0000000100'),('1000'),('+1000'),('-1000'),('0000001000'),('+0000001000'),('-0000001000'),('10000'),('+10000'),('-10000'),('0000010000'),('+0000010000'),('-0000010000'),('100000'),('+100000'),('-100000'),('0000100000'),('+0000100000'),('-0000100000'),('1000000'),('+1000000'),('-1000000'),('0001000000'),('+0001000000'),('-0001000000'),('10000000'),('[phone]'),('-10000000'),('0010000000'),('+0010000000'),('-0010000000'),('100000000'),('[phone]'),('-100000000'),('0100000000'),('+0100000000'),('-0100000000'),('1000000000'),('[phone]'),('-1000000000'),('1000000000'),('[phone]'),('-1000000000');
 --enable_warnings
 select * from t1;
@@ -374,7 +374,7 @@
 --replace_regex /ENGINE=[a-zA-Z]+/ENGINE=DEFAULT/
 show create table t1;
 drop table t1;
---error 1426
+--error ER_TOO_BIG_PRECISION
 create table t1 (d decimal(66,0));
 
 #
@@ -447,7 +447,7 @@
 #
 # Bug#22183: Unhandled NULL caused server crash
 #
---error 1689 # 1 is not a valid Julian Day Number for SQL date range
+--error ER_ARGUMENT_OUT_OF_RANGE # 1 is not a valid Julian Day Number for SQL date range
 create table t1 as
  select from_days(s) as date,t
  from (select 1 as s,'t' as t union select null, null ) as sub1;
@@ -548,7 +548,7 @@
 # This INSERT statement will give an error since truncation of a
 # decimal number in Drizzle is an error. See bug#337038 for further
 # details.
---error 1265
+--error ER_WARN_DATA_TRUNCATED
 INSERT INTO t1 VALUES (999.99, 5);
 --replace_regex /ENGINE=[a-zA-Z]+/ENGINE=DEFAULT/
 show create table t1;

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_enum.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_enum.test	2010-04-07 05:15:47 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_enum.test	2010-08-27 21:22:40 +0000
@@ -31,7 +31,7 @@
 #
 
 create table t1 (a enum ('0','1') primary key);
---error 1691 # Bad enum
+--error ER_INVALID_ENUM_VALUE # Bad enum
 insert into t1 set a='foobar';
 select * from t1;
 update t1 set a = replace(a,'x','y');
@@ -142,14 +142,14 @@
   id INT AUTO_INCREMENT PRIMARY KEY,
   c1 ENUM('a', '', 'b')
 );
---error 1691 # 0 is not valid way to insert.  Must use 1-based index of key.
+--error ER_INVALID_ENUM_VALUE # 0 is not valid way to insert.  Must use 1-based index of key.
 INSERT INTO t1 (c1) VALUES (0), ('a'), (''), ('b');
---error 1691 # 0 is not valid way to insert.  Must use 1-based index of key.
+--error ER_INVALID_ENUM_VALUE # 0 is not valid way to insert.  Must use 1-based index of key.
 INSERT INTO t1 (c1) VALUES (0), ('a'), (''), ('b');
 INSERT INTO t1 (c1) VALUES ('a'), ('b');
 SELECT id, c1 + 0, c1 FROM t1;
 
---error 1691 # Bad en
+--error ER_INVALID_ENUM_VALUE # Bad en
 ALTER TABLE t1 CHANGE c1 c1 ENUM('a', '') NOT NULL;
 # Below works because '' was not inserted in any statement above...
 ALTER TABLE t1 CHANGE c1 c1 ENUM('a', 'b') NOT NULL;
@@ -163,9 +163,9 @@
 # Bug#28729: Field_enum wrongly reported an error while storing an empty string.
 #
 create table t1(f1 enum('a','b') primary key);
---error 1691 # Bad enum
+--error ER_INVALID_ENUM_VALUE # Bad enum
 insert into t1 values(''),(''),('a'),('b');
---error 1691 # Bad enum
+--error ER_INVALID_ENUM_VALUE # Bad enum
 select * from t1 where f1='';
 drop table t1;
 
@@ -177,7 +177,7 @@
 CREATE TABLE t1 (c1 ENUM('a', '', 'b') primary key);
 INSERT INTO t1 (c1) VALUES ('b');
 INSERT INTO t1 (c1) VALUES ('');
---error 1691 # Bad enum 0
+--error ER_INVALID_ENUM_VALUE # Bad enum 0
 INSERT INTO t1 (c1) VALUES (0);
 INSERT INTO t1 (c1) VALUES ('a');
 
@@ -193,7 +193,7 @@
 #
 
 CREATE TABLE t1(a enum('a','b','c','d'), pk int auto_increment primary key);
---error 1691 # Bad enum 0
+--error ER_INVALID_ENUM_VALUE # Bad enum 0
 INSERT INTO t1 (a) VALUES (4),(1),(0),(3);
 INSERT INTO t1 (a) VALUES (4),(1),(2),(3);
 
@@ -212,9 +212,9 @@
 
 ALTER TABLE t1 drop column pk, ADD PRIMARY KEY (a);
 
---error 1691 # Bad enum 0
+--error ER_INVALID_ENUM_VALUE # Bad enum 0
 EXPLAIN SELECT a FROM t1 WHERE a=0;
---error 1691 # Bad enum 0
+--error ER_INVALID_ENUM_VALUE # Bad enum 0
 SELECT a FROM t1 WHERE a=0;
 
 DROP TABLE t1;

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_float.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_float.test	2010-04-07 03:10:54 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_float.test	2010-08-27 21:22:40 +0000
@@ -60,9 +60,9 @@
 # float in a char(1) field
 #
 create table t1 (c20 char primary key);
---error 1406
+--error ER_DATA_TOO_LONG
 insert into t1 values (5000.0);
---error 1406
+--error ER_DATA_TOO_LONG
 insert into t1 values (0.5e4);
 drop table t1;
 
@@ -76,12 +76,12 @@
 # Ensure that maximum values as the result of number of decimals
 # being specified in table schema are enforced (Bug #7361)
 create table t1 (f float(4,3) primary key);
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t1 values (-11.0),(-11),("-11"),(11.0),(11),("11");
 select * from t1;
 drop table if exists t1;
 create table t1 (f double(4,3) primary key);
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t1 values (-11.0),(-11),("-11"),(11.0),(11),("11");
 select * from t1;
 drop table if exists t1;
@@ -187,9 +187,9 @@
 # bug #12694 (float(m,d) specifications)
 #
 
---error 1427
+--error ER_M_BIGGER_THAN_D
 create table t1 (s1 float(0,2));
---error 1427
+--error ER_M_BIGGER_THAN_D
 create table t1 (s1 float(1,2));
 
 # Bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits"
@@ -198,7 +198,7 @@
 create table t1 (f1 double(200, 0) primary key);
 insert into t1 values (1e199), (-1e199);
 insert into t1 values (1e200), (-1e200);
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t1 values (2e200), (-2e200);
 select f1 + 0e0 from t1;
 drop table t1;
@@ -206,7 +206,7 @@
 create table t1 (f1 float(30, 0) primary key);
 insert into t1 values (1e29), (-1e29);
 insert into t1 values (1e30), (-1e30);
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t1 values (2e30), (-2e30);
 select f1 + 0e0 from t1;
 drop table t1;

=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_timestamp.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_timestamp.test	2010-04-27 04:31:43 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/type_timestamp.test	2010-08-27 21:22:40 +0000
@@ -83,15 +83,15 @@
 # (for both strings and numbers)
 #
 create table t1 (ix timestamp primary key);
---error 1685 # Bad unix timestamp
+--error ER_INVALID_UNIX_TIMESTAMP_VALUE # Bad unix timestamp
 insert into t1 values (0),(20030101010160),(20030101016001),(20030101240101),(20030132010101),(20031301010101),(20031200000000),(20030000000000);
 select ix+0 from t1;
 truncate table t1;
---error 1685 # Bad unix timestamp
+--error ER_INVALID_UNIX_TIMESTAMP_VALUE # Bad unix timestamp
 insert into t1 values ("00000000000000"),("20030101010160"),("20030101016001"),("20030101240101"),("20030132010101"),("20031301010101"),("20031200000000"),("20030000000000");
 select ix+0 from t1;
 truncate table t1;
---error 1685 # Bad unix timestamp
+--error ER_INVALID_UNIX_TIMESTAMP_VALUE # Bad unix timestamp
 insert into t1 values ("0000-00-00 00:00:00 some trailer"),("2003-01-01 00:00:00 some trailer");
 select ix+0 from t1;
 drop table t1;
@@ -100,9 +100,9 @@
 # Test for TIMESTAMP column with default now() and on update now() clauses
 #
 
---error 1293
+--error ER_TOO_MUCH_AUTO_TIMESTAMP_COLS
 create table t1 (t1 timestamp default now(), t2 timestamp on update now());
---error 1293
+--error ER_TOO_MUCH_AUTO_TIMESTAMP_COLS
 create table t1 (t1 timestamp on update now(), t2 timestamp default now() on update now());
 
 # Let us test TIMESTAMP auto-update behaviour
@@ -314,12 +314,12 @@
 --sorted_result
 select * from t1;
 # Embedded InnoDB needs to have HailDB instead of libinnodb before this will work
---error 1022
+--error ER_DUP_KEY
 insert into t1 (a) values (3), (5) on duplicate key update b = 3, c = c;
 --sorted_result
 select * from t1;
 # Embedded InnoDB needs to have HailDB instead of libinnodb before this will work
---error 1022
+--error ER_DUP_KEY
 insert into t1 (a, c) values (4, '2004-04-04 00:00:00'),
   (6, '2006-06-06 06:06:06') on duplicate key update b = 4;
 --sorted_result

=== modified file 'plugin/filesystem_engine/tests/t/basic_create_table.test'
--- plugin/filesystem_engine/tests/t/basic_create_table.test	2010-06-29 13:21:24 +0000
+++ plugin/filesystem_engine/tests/t/basic_create_table.test	2010-08-27 21:22:40 +0000
@@ -3,21 +3,21 @@
 --enable_warnings
 
 # test file not existed
---error 1005
+--error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 (a INT) ENGINE=FILESYSTEM,FILE="../filesystem_ln/_FILE_NOT_EXISTED_";
 
 # test col separator not empty
---error 1698
+--error ER_UNKNOWN_ENGINE_OPTION
 CREATE TABLE t1 (a INT) ENGINE=FILESYSTEM,FILE="../filesystem_ln/basic_create_table.data",COL_SEPARATOR="";
 
 # test row separator not empty
---error 1698
+--error ER_UNKNOWN_ENGINE_OPTION
 CREATE TABLE t1 (a INT) ENGINE=FILESYSTEM,FILE="../filesystem_ln/basic_create_table.data",ROW_SEPARATOR="";
 
 CREATE TABLE t1 (a INT) ENGINE=FILESYSTEM,FILE="../filesystem_ln/basic_create_table.data";
 
 # test table existed
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 CREATE TABLE t1 (a INT) ENGINE=FILESYSTEM,FILE="../filesystem_ln/basic_create_table.data";
 
 SHOW CREATE TABLE t1;

=== modified file 'plugin/myisam/tests/t/myisam.test'
--- plugin/myisam/tests/t/myisam.test	2010-08-10 18:09:11 +0000
+++ plugin/myisam/tests/t/myisam.test	2010-08-27 21:22:40 +0000
@@ -329,10 +329,10 @@
 # Test of creating table with too long key
 #
 
---error 1071
+--error ER_TOO_LONG_KEY
 CREATE TEMPORARY TABLE t1 (a varchar(300), b varchar(300), c varchar(300), d varchar(300), e varchar(300), KEY t1 (a, b, c, d, e)) ENGINE=MyISAM;
 CREATE TEMPORARY TABLE t1 (a varchar(300), b varchar(300), c varchar(300), d varchar(300), e varchar(300)) ENGINE=MyISAM;
---error 1071
+--error ER_TOO_LONG_KEY
 ALTER TABLE t1 ADD INDEX t1 (a, b, c, d, e);
 DROP TABLE t1;
 
@@ -805,15 +805,15 @@
 # Some errors/warnings on create
 #
 
---error 1074
+--error ER_TOO_BIG_FIELDLENGTH
 create temporary table t1 (v varchar(65530), key(v));
---error 1074
+--error ER_TOO_BIG_FIELDLENGTH
 create temporary table t1 (v varchar(65536));
---error 1074
+--error ER_TOO_BIG_FIELDLENGTH
 create temporary table t1 (v varchar(65530));
 
 # MyISAM specific varchar tests
---error 1074
+--error ER_TOO_BIG_FIELDLENGTH
 create temporary table t1 (v varchar(65535));
 
 eval set storage_engine=$default;

=== modified file 'plugin/pbxt/tests/t/basic_create_nullable.test'
--- plugin/pbxt/tests/t/basic_create_nullable.test	2010-08-12 22:49:45 +0000
+++ plugin/pbxt/tests/t/basic_create_nullable.test	2010-08-27 21:22:40 +0000
@@ -1,9 +1,9 @@
 create table t1 (a int, b int not null, c int null, d int not null, pk int primary key);
 show create table t1;
 insert into t1 values (0,0, 0, 0,0);
---error 1048
+--error ER_BAD_NULL_ERROR
 insert into t1 values (NULL, NULL, NULL, NULL, 1);
 insert into t1 values (NULL, 1, NULL, 1, 2);
---error 1048
+--error ER_BAD_NULL_ERROR
 insert into t1 values (1,2,3,NULL, 3);
 drop table t1;

=== modified file 'plugin/pbxt/tests/t/basic_create_table.test'
--- plugin/pbxt/tests/t/basic_create_table.test	2010-08-12 22:49:45 +0000
+++ plugin/pbxt/tests/t/basic_create_table.test	2010-08-27 21:22:40 +0000
@@ -1,6 +1,6 @@
 CREATE TABLE t1 (a int primary key);
 SHOW CREATE TABLE t1;
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 CREATE TABLE t1 (a int primary key);
 CREATE TABLE t2 (a int primary key, b varchar(20), c bigint);
 

=== modified file 'plugin/pbxt/tests/t/basic_drop_table.test'
--- plugin/pbxt/tests/t/basic_drop_table.test	2010-08-12 22:49:45 +0000
+++ plugin/pbxt/tests/t/basic_drop_table.test	2010-08-27 21:22:40 +0000
@@ -2,6 +2,6 @@
 CREATE TABLE t2 (a int primary key);
 DROP TABLE t1;
 DROP TABLE t2;
---error 1051
+--error ER_BAD_TABLE_ERROR
 DROP TABLE t3;
 

=== modified file 'plugin/pbxt/tests/t/basic_insert_pkey_duplicate.test'
--- plugin/pbxt/tests/t/basic_insert_pkey_duplicate.test	2010-08-12 22:49:45 +0000
+++ plugin/pbxt/tests/t/basic_insert_pkey_duplicate.test	2010-08-27 21:22:40 +0000
@@ -1,5 +1,5 @@
 create table t1 (a int primary key);
 insert into t1 values (1);
---error 1062,1022
+--error ER_DUP_ENTRY, ER_DUP_KEY
 insert into t1 values (1);
 drop table t1;

=== modified file 'plugin/pbxt/tests/t/basic_statement_rollback.test'
--- plugin/pbxt/tests/t/basic_statement_rollback.test	2010-08-12 22:49:45 +0000
+++ plugin/pbxt/tests/t/basic_statement_rollback.test	2010-08-27 21:22:40 +0000
@@ -3,7 +3,7 @@
 select * from t1;
 begin;
 insert into t1 values (5);
---error 1022,1062
+--error ER_DUP_KEY, ER_DUP_ENTRY
 insert into t1 values (1),(2),(3),(4);
 commit;
 select * from t1;

=== modified file 'plugin/rand_function/tests/t/basic.test'
--- plugin/rand_function/tests/t/basic.test	2010-06-04 09:22:02 +0000
+++ plugin/rand_function/tests/t/basic.test	2010-08-27 21:22:40 +0000
@@ -3,7 +3,7 @@
 # Bug #7281: problem with rand()
 #
 
---error 1054
+--error ER_BAD_FIELD_ERROR
 select rand(rand);
 
 #

=== modified file 'plugin/schema_dictionary/tests/t/no_default.test'
--- plugin/schema_dictionary/tests/t/no_default.test	2010-03-17 13:39:11 +0000
+++ plugin/schema_dictionary/tests/t/no_default.test	2010-08-27 21:22:40 +0000
@@ -1,5 +1,5 @@
 create table t1 (a int primary key);
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 insert into t1 values ();
 select COLUMN_NAME,COLUMN_DEFAULT,COLUMN_DEFAULT_IS_NULL FROM DATA_DICTIONARY.COLUMNS WHERE TABLE_SCHEMA="test" AND TABLE_NAME="t1";
 drop table t1;

=== modified file 'plugin/show_schema_proto/tests/t/basic.test'
--- plugin/show_schema_proto/tests/t/basic.test	2010-03-16 23:42:10 +0000
+++ plugin/show_schema_proto/tests/t/basic.test	2010-08-27 21:22:40 +0000
@@ -10,7 +10,7 @@
 #
 #
 ##SELECT SHOW_SCHEMA_PROTO('test');
---error 1049
+--error ER_BAD_DB_ERROR
 SELECT SHOW_SCHEMA_PROTO('not_exists');
 #CREATE DATABASE foobar COLLATE = utf8_bin;
 #SELECT SHOW_SCHEMA_PROTO('foobar');

=== modified file 'plugin/sleep/tests/t/sleep.test'
--- plugin/sleep/tests/t/sleep.test	2010-03-03 20:57:45 +0000
+++ plugin/sleep/tests/t/sleep.test	2010-08-27 21:22:40 +0000
@@ -1,6 +1,6 @@
---error 1582
+--error ER_WRONG_PARAMCOUNT_TO_FUNCTION
 select sleep();
---error 1582
+--error ER_WRONG_PARAMCOUNT_TO_FUNCTION
 select sleep(10,10);
 select sleep('a');
 show warnings;

=== modified file 'plugin/tableprototester/tests/t/drop_table.test'
--- plugin/tableprototester/tests/t/drop_table.test	2010-03-27 21:22:09 +0000
+++ plugin/tableprototester/tests/t/drop_table.test	2010-08-27 21:22:40 +0000
@@ -1,2 +1,2 @@
---error 1693
+--error ER_CORRUPT_TABLE_DEFINITION
 DROP TABLE t1;

=== modified file 'plugin/tableprototester/tests/t/invalid_table_collation.test'
--- plugin/tableprototester/tests/t/invalid_table_collation.test	2010-07-05 03:25:34 +0000
+++ plugin/tableprototester/tests/t/invalid_table_collation.test	2010-08-27 21:22:40 +0000
@@ -1,3 +1,3 @@
---error 1693
+--error ER_CORRUPT_TABLE_DEFINITION
 SHOW CREATE TABLE test.invalid_table_collation;
 

=== modified file 'plugin/tableprototester/tests/t/missing_engine.test'
--- plugin/tableprototester/tests/t/missing_engine.test	2010-06-03 04:49:12 +0000
+++ plugin/tableprototester/tests/t/missing_engine.test	2010-08-27 21:22:40 +0000
@@ -1,5 +1,5 @@
 
 SHOW TABLES like 't1';
 
---error 1693
+--error ER_CORRUPT_TABLE_DEFINITION
 SHOW CREATE TABLE t1;

=== modified file 'plugin/tableprototester/tests/t/too_many_enum_values.test'
--- plugin/tableprototester/tests/t/too_many_enum_values.test	2010-06-03 07:57:13 +0000
+++ plugin/tableprototester/tests/t/too_many_enum_values.test	2010-08-27 21:22:40 +0000
@@ -1,5 +1,5 @@
---error 1693
+--error ER_CORRUPT_TABLE_DEFINITION
 SHOW CREATE TABLE too_many_enum_values;
---error 1693
+--error ER_CORRUPT_TABLE_DEFINITION
 SELECT * FROM too_many_enum_values;
 

=== modified file 'tests/suite/broken/t/packet.test'
--- tests/suite/broken/t/packet.test	2008-10-18 15:43:20 +0000
+++ tests/suite/broken/t/packet.test	2010-08-27 21:22:40 +0000
@@ -20,7 +20,7 @@
 connect (con2,localhost,root,,);
 connection con2;
 select @@net_buffer_length, @@max_allowed_packet;
---error 1153
+--error ER_NET_PACKET_TOO_LARGE
 SELECT length("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") as len;
 set global max_allowed_packet=default;
 set max_allowed_packet=default;

=== modified file 'tests/suite/broken/t/strict-date.test'
--- tests/suite/broken/t/strict-date.test	2009-01-12 02:31:02 +0000
+++ tests/suite/broken/t/strict-date.test	2010-08-27 21:22:40 +0000
@@ -16,42 +16,42 @@
 
 # All test cases expected to fail should return 
 #      SQLSTATE 22007 <invalid date value>
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-0-31');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-01-02'),('2004-0-31');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-10-0');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-09-31');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-10-32');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2003-02-29');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-13-15');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('0000-00-00');
 # Standard says we should return SQLSTATE 22018
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES ('59');
 
 # Test the different related modes
 set @@sql_mode='STRICT_ALL_TABLES';
 INSERT INTO t1 VALUES('2004-01-03'),('2004-0-31');
 set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_IN_DATE';
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-0-30');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-01-04'),('2004-0-31'),('2004-01-05');
 INSERT INTO t1 VALUES('0000-00-00');
 INSERT IGNORE INTO t1 VALUES('2004-0-29');
 set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_DATE';
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('0000-00-00');
 INSERT IGNORE INTO t1 VALUES('0000-00-00');
 INSERT INTO t1 VALUES ('2004-0-30');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES ('2004-2-30');
 set @@sql_mode='STRICT_ALL_TABLES,ALLOW_INVALID_DATES';
 INSERT INTO t1 VALUES ('2004-2-30');
@@ -64,11 +64,11 @@
 
 set @@sql_mode='strict_trans_tables';
 CREATE TABLE t1 (col1 date) engine=myisam;
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-13-31'),('2004-1-1');
 INSERT INTO t1 VALUES ('2004-1-2'), ('2004-13-31'),('2004-1-3');
 INSERT IGNORE INTO t1 VALUES('2004-13-31'),('2004-1-4');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES ('2003-02-29');
 INSERT ignore INTO t1 VALUES('2003-02-30');
 set @@sql_mode='STRICT_ALL_TABLES,ALLOW_INVALID_DATES';
@@ -78,12 +78,12 @@
 
 set @@sql_mode='strict_trans_tables';
 CREATE TABLE t1 (col1 date) engine=innodb;
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-13-31'),('2004-1-1');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES ('2004-1-2'), ('2004-13-31'),('2004-1-3');
 INSERT IGNORE INTO t1 VALUES('2004-13-31'),('2004-1-4');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES ('2003-02-29');
 INSERT ignore INTO t1 VALUES('2003-02-30');
 set @@sql_mode='STRICT_ALL_TABLES,ALLOW_INVALID_DATES';
@@ -100,22 +100,22 @@
 
 # All test cases expected to fail should return 
 #      SQLSTATE 22007 <invalid datetime value>
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-0-31 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-10-0 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-09-31 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-10-32 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2003-02-29 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-13-15 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('0000-00-00 15:30:00');
 # Standard says we should return SQLSTATE 22018
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES ('59');
 select * from t1;
 drop table t1;
@@ -129,49 +129,49 @@
 # All test cases expected to fail should return 
 #      SQLSTATE 22007 <invalid datetime value>
 # Standard says we should return ok, but we can't as this is out of range
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('0000-10-31 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-0-31 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-10-0 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-09-31 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-10-32 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2003-02-29 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-13-15 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-02-29 25:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-02-29 15:65:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-02-29 15:31:61');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('0000-00-00 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('0000-00-00 00:00:00');
 INSERT IGNORE INTO t1 VALUES('0000-00-00 00:00:00');
 # Standard says we should return SQLSTATE 22018
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES ('59');
 
 set @@sql_mode='STRICT_ALL_TABLES,ALLOW_INVALID_DATES';
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-0-31 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-10-0 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-10-32 15:30:00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('2004-02-30 15:30:04');
 INSERT INTO t1 VALUES('0000-00-00 00:00:00');
 set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_IN_DATE';
 INSERT INTO t1 VALUES('0000-00-00 00:00:00');
 set @@sql_mode='STRICT_ALL_TABLES,NO_ZERO_DATE';
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 VALUES('0000-00-00 00:00:00');
 set @@sql_mode='ansi,traditional';
 SELECT * FROM t1;
@@ -191,19 +191,19 @@
 
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));
 
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
---error 1411
+--error ER_WRONG_VALUE_FOR_TYPE
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
---error 1411
+--error ER_WRONG_VALUE_FOR_TYPE
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col1) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
 
 ## Test INSERT with STR_TO_DATE into DATETIME
@@ -212,40 +212,40 @@
 
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));
 
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
---error 1411
+--error ER_WRONG_VALUE_FOR_TYPE
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
---error 1411
+--error ER_WRONG_VALUE_FOR_TYPE
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col2) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
 
 ## Test INSERT with STR_TO_DATE into TIMESTAMP
 #       All test cases expected to fail should return 
 #       SQLSTATE 22007 <invalid datetime value>
 
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('31.9.2004 15.30','%d.%m.%Y %H.%i'));
---error 1411
+--error ER_WRONG_VALUE_FOR_TYPE
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('29.02.2003 15.30','%d.%m.%Y %H.%i'));
---error 1411
+--error ER_WRONG_VALUE_FOR_TYPE
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('15.13.2004 15.30','%d.%m.%Y %H.%i'));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));
 
 drop table t1;
@@ -265,25 +265,25 @@
 
 INSERT INTO t1 (col1) VALUES(CAST('0000-10-31' AS DATE));
 
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col1) VALUES(CAST('2004-10-0' AS DATE));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col1) VALUES(CAST('2004-0-10' AS DATE));
 
 # deactivated because of Bug#8294
 # Bug#8294 Traditional: Misleading error message for invalid CAST to DATE
-# --error 1292
+# --error ER_TRUNCATED_WRONG_VALUE
 # INSERT INTO t1 (col1) VALUES(CAST('2004-9-31' AS DATE));
-# --error 1292
+# --error ER_TRUNCATED_WRONG_VALUE
 # INSERT INTO t1 (col1) VALUES(CAST('2004-10-32' AS DATE));
-# --error 1292
+# --error ER_TRUNCATED_WRONG_VALUE
 # INSERT INTO t1 (col1) VALUES(CAST('2003-02-29' AS DATE));
-# --error 1292
+# --error ER_TRUNCATED_WRONG_VALUE
 # INSERT INTO t1 (col1) VALUES(CAST('2004-13-15' AS DATE));
 
 # deactivated because of Bug#6145
 #  Bug#6145: Traditional: CONVERT and CAST should reject zero DATE values
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col1) VALUES(CAST('0000-00-00' AS DATE));
 
 ## Test INSERT with CAST AS DATETIME into DATETIME
@@ -292,53 +292,53 @@
 
 INSERT INTO t1 (col2) VALUES(CAST('0000-10-31 15:30' AS DATETIME));
 
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col2) VALUES(CAST('2004-10-0 15:30' AS DATETIME));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col2) VALUES(CAST('2004-0-10 15:30' AS DATETIME));
 
 # deactivated because of Bug#8294
 # Bug#8294 Traditional: Misleading error message for invalid CAST to DATE
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col2) VALUES(CAST('2004-9-31 15:30' AS DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col2) VALUES(CAST('2004-10-32 15:30' AS DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col2) VALUES(CAST('2003-02-29 15:30' AS DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col2) VALUES(CAST('2004-13-15 15:30' AS DATETIME));
 
 # Bug#6145: Traditional: CONVERT and CAST should reject zero DATE values
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col2) VALUES(CAST('0000-00-00' AS DATETIME));
 
 ## Test INSERT with CAST AS DATETIME into TIMESTAMP
 #       All test cases expected to fail should return 
 #       SQLSTATE 22007 <invalid datetime value>
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(CAST('0000-10-31 15:30' AS DATETIME));
 # should return OK
 # We accept this to be a failure
 
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(CAST('2004-10-0 15:30' AS DATETIME));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(CAST('2004-0-10 15:30' AS DATETIME));
 # should return SQLSTATE 22007 <invalid datetime value>
 
 # deactivated because of Bug#8294
 # Bug#8294 Traditional: Misleading error message for invalid CAST to DATE
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col3) VALUES(CAST('2004-9-31 15:30' AS DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col3) VALUES(CAST('2004-10-32 15:30' AS DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col3) VALUES(CAST('2003-02-29 15:30' AS DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col3) VALUES(CAST('2004-13-15 15:30' AS DATETIME));
 
 # Bug#6145: Traditional: CONVERT and CAST should reject zero DATE values
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(CAST('0000-00-00' AS DATETIME));
 
 drop table t1;
@@ -359,24 +359,24 @@
 
 INSERT INTO t1 (col1) VALUES(CONVERT('0000-10-31' , DATE));
 
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col1) VALUES(CONVERT('2004-10-0' , DATE));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col1) VALUES(CONVERT('2004-0-10' , DATE));
 
 # deactivated because of Bug#8294
 # Bug#8294 Traditional: Misleading error message for invalid CAST to DATE
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col1) VALUES(CONVERT('2004-9-31' , DATE));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col1) VALUES(CONVERT('2004-10-32' , DATE));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col1) VALUES(CONVERT('2003-02-29' , DATE));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col1) VALUES(CONVERT('2004-13-15',DATE));
 
 # Bug#6145: Traditional: CONVERT and CAST should reject zero DATE values
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col1) VALUES(CONVERT('0000-00-00',DATE));
 
 ## Test INSERT with CONVERT to DATETIME into DATETIME
@@ -385,52 +385,52 @@
 
 INSERT INTO t1 (col2) VALUES(CONVERT('0000-10-31 15:30',DATETIME));
 
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col2) VALUES(CONVERT('2004-10-0 15:30',DATETIME));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col2) VALUES(CONVERT('2004-0-10 15:30',DATETIME));
 
 # deactivated because of Bug#8294
 # Bug#8294 Traditional: Misleading error message for invalid CAST to DATE
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col2) VALUES(CONVERT('2004-9-31 15:30',DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col2) VALUES(CONVERT('2004-10-32 15:30',DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col2) VALUES(CONVERT('2003-02-29 15:30',DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col2) VALUES(CONVERT('2004-13-15 15:30',DATETIME));
 
 # Bug#6145: Traditional: CONVERT and CAST should reject zero DATE values
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col2) VALUES(CONVERT('0000-00-00',DATETIME));
 
 ## Test INSERT with CONVERT to DATETIME into DATETIME
 #       All test cases expected to fail should return 
 #       SQLSTATE 22007 <invalid datetime value>
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(CONVERT('0000-10-31 15:30',DATETIME));
 # should return OK
 # We accept this to be a failure
 
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(CONVERT('2004-10-0 15:30',DATETIME));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(CONVERT('2004-0-10 15:30',DATETIME));
 
 # deactivated because of Bug#8294
 # Bug#8294 Traditional: Misleading error message for invalid CAST to DATE
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col3) VALUES(CONVERT('2004-9-31 15:30',DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col3) VALUES(CONVERT('2004-10-32 15:30',DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col3) VALUES(CONVERT('2003-02-29 15:30',DATETIME));
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #INSERT INTO t1 (col3) VALUES(CONVERT('2004-13-15 15:30',DATETIME));
 
 # Bug#6145: Traditional: CONVERT and CAST should reject zero DATE values
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 INSERT INTO t1 (col3) VALUES(CONVERT('0000-00-00',DATETIME));
 
 drop table t1;
@@ -440,13 +440,13 @@
 #
 
 create table t1 (col1 date, col2 datetime, col3 timestamp);
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 insert into t1 values (0,0,0);
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 insert into t1 values (0.0,0.0,0.0);
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 insert into t1 (col1) values (convert('0000-00-00',date));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 insert into t1 (col1) values (cast('0000-00-00' as date));
 
 set sql_mode='no_zero_date';
@@ -456,16 +456,16 @@
 set sql_mode='traditional';
 create table t1 (col1 date);
 insert ignore into t1 values ('0000-00-00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 insert into t1 select * from t1;
 insert ignore into t1 values ('0000-00-00');
 insert ignore into t1 (col1) values (cast('0000-00-00' as date));
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 insert into t1 select * from t1;
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 alter table t1 modify col1 datetime;
 alter ignore table t1 modify col1 datetime;
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 insert into t1 select * from t1;
 select * from t1;
 drop table t1;
@@ -474,12 +474,12 @@
 # Bug #5906: handle invalid date due to conversion
 #
 create table t1 (d date);
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 insert into t1 values ('2000-10-00');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 insert into t1 values (1000);
 insert into t1 values ('2000-10-01');
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 update t1 set d = 1100;
 select * from t1;
 drop table t1;

=== modified file 'tests/suite/jp/t/jp_like_utf8.test'
--- tests/suite/jp/t/jp_like_utf8.test	2010-06-22 19:48:34 +0000
+++ tests/suite/jp/t/jp_like_utf8.test	2010-08-27 21:22:40 +0000
@@ -30,15 +30,15 @@
 # jisx0212 supplemental character data
 
 LOAD DATA INFILE '../std_data_ln/jisx0201_utf8.dat' INTO TABLE `Ｔ１`;
---error 1406
+--error ER_DATA_TOO_LONG
 LOAD DATA INFILE '../std_data_ln/jisx0208_utf8.dat' INTO TABLE `ï¼´ï¼’`;
 LOAD DATA INFILE '../std_data_ln/jisx0212_utf8.dat' INTO TABLE `Ｔ３`;
 LOAD DATA INFILE '../std_data_ln/jisx0201_utf8.dat' INTO TABLE `ï¼´ï¼”`;
---error 1406
+--error ER_DATA_TOO_LONG
 LOAD DATA INFILE '../std_data_ln/jisx0208_utf8.dat' INTO TABLE `Ｔ５`;
 LOAD DATA INFILE '../std_data_ln/jisx0212_utf8.dat' INTO TABLE `ï¼´ï¼–`;
 LOAD DATA INFILE '../std_data_ln/jisx0201_utf8.dat' INTO TABLE `ï¼´ï¼—`;
---error 1406
+--error ER_DATA_TOO_LONG
 LOAD DATA INFILE '../std_data_ln/jisx0208_utf8.dat' INTO TABLE `Ｔ８`;
 LOAD DATA INFILE '../std_data_ln/jisx0212_utf8.dat' INTO TABLE `ï¼´ï¼™`;
 

=== modified file 'tests/suite/jp/t/jp_select_utf8.test'
--- tests/suite/jp/t/jp_select_utf8.test	2010-06-22 19:48:34 +0000
+++ tests/suite/jp/t/jp_select_utf8.test	2010-08-27 21:22:40 +0000
@@ -30,15 +30,15 @@
 # jisx0212 supplemental character data
 
 LOAD DATA INFILE '../std_data_ln/jisx0201_utf8.dat' INTO TABLE `Ｔ１`;
---error 1406
+--error ER_DATA_TOO_LONG
 LOAD DATA INFILE '../std_data_ln/jisx0208_utf8.dat' INTO TABLE `ï¼´ï¼’`;
 LOAD DATA INFILE '../std_data_ln/jisx0212_utf8.dat' INTO TABLE `Ｔ３`;
 LOAD DATA INFILE '../std_data_ln/jisx0201_utf8.dat' INTO TABLE `ï¼´ï¼”`;
---error 1406
+--error ER_DATA_TOO_LONG
 LOAD DATA INFILE '../std_data_ln/jisx0208_utf8.dat' INTO TABLE `Ｔ５`;
 LOAD DATA INFILE '../std_data_ln/jisx0212_utf8.dat' INTO TABLE `ï¼´ï¼–`;
 LOAD DATA INFILE '../std_data_ln/jisx0201_utf8.dat' INTO TABLE `ï¼´ï¼—`;
---error 1406
+--error ER_DATA_TOO_LONG
 LOAD DATA INFILE '../std_data_ln/jisx0208_utf8.dat' INTO TABLE `Ｔ８`;
 LOAD DATA INFILE '../std_data_ln/jisx0212_utf8.dat' INTO TABLE `ï¼´ï¼™`;
 

=== modified file 'tests/suite/jp/t/jp_where_utf8.test'
--- tests/suite/jp/t/jp_where_utf8.test	2010-06-22 19:48:34 +0000
+++ tests/suite/jp/t/jp_where_utf8.test	2010-08-27 21:22:40 +0000
@@ -30,15 +30,15 @@
 # jisx0212 supplemental character data
 
 LOAD DATA INFILE '../std_data_ln/jisx0201_utf8.dat' INTO TABLE `Ｔ１`;
---error 1406
+--error ER_DATA_TOO_LONG
 LOAD DATA INFILE '../std_data_ln/jisx0208_utf8.dat' INTO TABLE `ï¼´ï¼’`;
 LOAD DATA INFILE '../std_data_ln/jisx0212_utf8.dat' INTO TABLE `Ｔ３`;
 LOAD DATA INFILE '../std_data_ln/jisx0201_utf8.dat' INTO TABLE `ï¼´ï¼”`;
---error 1406
+--error ER_DATA_TOO_LONG
 LOAD DATA INFILE '../std_data_ln/jisx0208_utf8.dat' INTO TABLE `Ｔ５`;
 LOAD DATA INFILE '../std_data_ln/jisx0212_utf8.dat' INTO TABLE `ï¼´ï¼–`;
 LOAD DATA INFILE '../std_data_ln/jisx0201_utf8.dat' INTO TABLE `ï¼´ï¼—`;
---error 1406
+--error ER_DATA_TOO_LONG
 LOAD DATA INFILE '../std_data_ln/jisx0208_utf8.dat' INTO TABLE `Ｔ８`;
 LOAD DATA INFILE '../std_data_ln/jisx0212_utf8.dat' INTO TABLE `ï¼´ï¼™`;
 

=== modified file 'tests/t/almost_full.test'
--- tests/t/almost_full.test	2010-08-13 17:44:18 +0000
+++ tests/t/almost_full.test	2010-08-27 21:22:40 +0000
@@ -21,11 +21,11 @@
 
 #DELETE FROM t1 WHERE a=1 or a=5;
 
-#--error 1114
+#--error ER_RECORD_FILE_FULL
 #INSERT INTO t1 SET b=repeat('a',600);
 #CHECK TABLE t1 EXTENDED;
 
-#--error 1114
+#--error ER_RECORD_FILE_FULL
 #UPDATE t1 SET b=repeat('a', 800) where a=10;
 #CHECK TABLE t1 EXTENDED;
 

=== modified file 'tests/t/alter_column_drop_default.test'
--- tests/t/alter_column_drop_default.test	2009-05-19 07:45:34 +0000
+++ tests/t/alter_column_drop_default.test	2010-08-27 21:22:40 +0000
@@ -2,7 +2,7 @@
 INSERT INTO t1 values ();
 SELECT * FROM t1;
 ALTER TABLE t1 ALTER COLUMN a DROP DEFAULT;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 INSERT INTO t1 values ();
 INSERT INTO t1 (a) VALUES (11);
 SELECT * FROM t1 ORDER BY a;

=== modified file 'tests/t/alter_table.test'
--- tests/t/alter_table.test	2010-06-08 05:20:09 +0000
+++ tests/t/alter_table.test	2010-08-27 21:22:40 +0000
@@ -522,11 +522,11 @@
 #create table t1(f1 int);
 #alter table t1 add column f2 datetime not null, add column f21 date not null;
 #insert into t1 values(1,'2000-01-01','2000-01-01');
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #alter table t1 add column f3 datetime not null;
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #alter table t1 add column f3 date not null;
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #alter table t1 add column f4 datetime not null default '2002-02-02',
 #  add column f41 date not null;
 #alter table t1 add column f4 datetime not null default '2002-02-02',

=== modified file 'tests/t/alter_table_options.test'
--- tests/t/alter_table_options.test	2010-05-12 21:58:06 +0000
+++ tests/t/alter_table_options.test	2010-08-27 21:22:40 +0000
@@ -1,5 +1,5 @@
 CREATE TABLE t1 (a int);
---error 1698
+--error ER_UNKNOWN_ENGINE_OPTION
 ALTER TABLE t1 FOO=BAR, INVALIDFOOBAR=0;
 SHOW WARNINGS;
 DROP TABLE t1;

=== modified file 'tests/t/analyze.test'
--- tests/t/analyze.test	2010-05-12 21:58:06 +0000
+++ tests/t/analyze.test	2010-08-27 21:22:40 +0000
@@ -64,9 +64,9 @@
 # Bug #30495: optimize table t1,t2,t3 extended errors
 #
 #create table t1(a int);
-#--error 1064
+#--error ER_PARSE_ERROR
 #analyze table t1 extended;
-#--error 1064
+#--error ER_PARSE_ERROR
 #optimize table t1 extended;
 #drop table t1;
 

=== modified file 'tests/t/auto_increment.test'
--- tests/t/auto_increment.test	2010-03-09 22:42:17 +0000
+++ tests/t/auto_increment.test	2010-08-27 21:22:40 +0000
@@ -136,7 +136,7 @@
 update t1 set a=0 where b=5;
 select * from t1 order by b;
 delete from t1 where a=0;
---error 1048
+--error ER_BAD_NULL_ERROR
 update t1 set a=NULL where b=6;
 update t1 set a=300 where b=7;
 insert into t1(a,b)values(NULL,8);
@@ -151,7 +151,7 @@
 update t1 set a=0 where b=12;
 select * from t1 order by b;
 delete from t1 where a=0;
---error 1048
+--error ER_BAD_NULL_ERROR
 update t1 set a=NULL where b=13;
 update t1 set a=500 where b=14;
 select * from t1 order by b;
@@ -169,7 +169,7 @@
 
 create table t1 (a bigint);
 insert into t1 values (1), (2), (3), (0), (0);
---error 1062
+--error ER_DUP_ENTRY
 alter table t1 modify a bigint not null auto_increment primary key; 
 select * from t1;
 drop table t1;
@@ -198,7 +198,7 @@
 select * from t1;
 #set sql_mode= '';
 alter table t1 modify b varchar(255);
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values (0,4);
 select * from t1;
 drop table t1;

=== modified file 'tests/t/binary.test'
--- tests/t/binary.test	2009-11-13 00:56:59 +0000
+++ tests/t/binary.test	2010-08-27 21:22:40 +0000
@@ -88,7 +88,7 @@
 --replace_regex /ENGINE=[a-zA-Z]+/ENGINE=DEFAULT/
 show create table t1;
 drop table t1;
---error 1064
+--error ER_PARSE_ERROR
 create table t2 (a varbinary);
 
 # End of 4.1 tests

=== modified file 'tests/t/broken_table_proto_file.test'
--- tests/t/broken_table_proto_file.test	2010-03-27 21:22:09 +0000
+++ tests/t/broken_table_proto_file.test	2010-08-27 21:22:40 +0000
@@ -11,9 +11,9 @@
 system echo "this is a junk file for test" >> $MYSQLTEST_VARDIR/master-data/test/t1.dfe ;
 --replace_column 6 # 7 # 8 # 9 #
 SHOW TABLE STATUS like 't1';
---error 1693
+--error ER_CORRUPT_TABLE_DEFINITION
 show create table t1;
---error 1693
+--error ER_CORRUPT_TABLE_DEFINITION
 drop table if exists t1;
 system rm -f $MYSQLTEST_VARDIR/master-data/test/t1.dfe;
 

=== modified file 'tests/t/case.test'
--- tests/t/case.test	2009-03-25 09:18:25 +0000
+++ tests/t/case.test	2010-08-27 21:22:40 +0000
@@ -66,14 +66,14 @@
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
---error 1267
+--error ER_CANT_AGGREGATE_2COLLATIONS
 SELECT CASE 
   WHEN 1 
   THEN 'a' COLLATE utf8_bin 
   ELSE 'a' COLLATE utf8_swedish_ci
   END;
 
---error 1270
+--error ER_CANT_AGGREGATE_3COLLATIONS
 SELECT CASE 'a' COLLATE utf8_bin
   WHEN 'a' COLLATE utf8_danish_ci  THEN 1
   WHEN 'a' COLLATE utf8_swedish_ci THEN 2
@@ -96,7 +96,7 @@
 #
 # Check COALESCE argument types aggregation
 
---error 1267
+--error ER_CANT_AGGREGATE_2COLLATIONS
 CREATE TABLE t1 SELECT COALESCE('a' COLLATE utf8_swedish_ci,'b' COLLATE utf8_bin);
 CREATE TABLE t1 SELECT 
  COALESCE(1), COALESCE(1.0),COALESCE('a'),

=== modified file 'tests/t/cast.test'
--- tests/t/cast.test	2010-03-22 23:04:11 +0000
+++ tests/t/cast.test	2010-08-27 21:22:40 +0000
@@ -37,7 +37,7 @@
 select cast(1000 as CHAR(3));
 
 # Should throw an error about 'abc' being too large for a char(2)
---error 1292
+--error ER_TRUNCATED_WRONG_VALUE
 create table t1 select
   cast('ab'  AS char)    as c1,
   cast('a '  AS char)    as c2,
@@ -57,7 +57,7 @@
 
 # BUG in drizzletest - can't handle these chars right
 # # Should throw an error about incorrect
-#--error 1292
+#--error ER_TRUNCATED_WRONG_VALUE
 #create table t1 select
 #  cast('ÆÇ'  AS char)    as c1,
 #  cast('Æ '  AS char)    as c2,

=== modified file 'tests/t/comment_column.test'
--- tests/t/comment_column.test	2010-02-19 23:07:45 +0000
+++ tests/t/comment_column.test	2010-08-27 21:22:40 +0000
@@ -62,7 +62,7 @@
 
 
 # comment overflow(warning)
---error 1470
+--error ER_WRONG_STRING_LENGTH
 ALTER TABLE t1 ADD COLUMN c11 INTEGER COMMENT 'ABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdABCDEfghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM data_dictionary.columns WHERE table_name='t1';
@@ -92,7 +92,7 @@
 
 # comment overflow(warning)
 drop table t1;
---error 1470
+--error ER_WRONG_STRING_LENGTH
 create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'Abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd', c2 INTEGER COMMENT 'aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdaBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',c3 INTEGER COMMENT '012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789', c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, INDEX i1 (c1) COMMENT 'i1 comment',INDEX i2(c2) 
 ) COMMENT='ABCDEFGHIJabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
@@ -100,11 +100,11 @@
 SELECT index_comment,char_length(index_comment) FROM data_dictionary.indexes WHERE table_name='t1';
 let $ENGINE=`select variable_value from data_dictionary.global_variables where variable_name='STORAGE_ENGINE'`;
 --replace_result $ENGINE ENGINE
---error 1146
+--error ER_NO_SUCH_TABLE
 SHOW CREATE TABLE t1;
 
 # comment overflow(error)
---error 1051
+--error ER_BAD_TABLE_ERROR
 DROP TABLE t1;
 --error ER_WRONG_STRING_LENGTH
 create table t1 (c1 VARCHAR(10) NOT NULL COMMENT 'Abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd', c2 INTEGER COMMENT 'aBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdaBcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd',c3 INTEGER COMMENT '012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789', c4 INTEGER, c5 INTEGER, c6 INTEGER, c7 INTEGER, INDEX i1 (c1) COMMENT 'i1 comment',INDEX i2(c2) 

=== modified file 'tests/t/comment_index.test'
--- tests/t/comment_index.test	2010-02-19 23:07:45 +0000
+++ tests/t/comment_index.test	2010-08-27 21:22:40 +0000
@@ -57,7 +57,7 @@
 
 
 # comment overflow(warning)
---error 1470
+--error ER_WRONG_STRING_LENGTH
 CREATE INDEX i11 ON t1(c11) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM data_dictionary.columns WHERE table_name='t1';
@@ -66,7 +66,7 @@
 --replace_result $ENGINE ENGINE
 SHOW CREATE TABLE t1;
 
---error 1470
+--error ER_WRONG_STRING_LENGTH
 ALTER TABLE t1 ADD INDEX (c13) COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcd';
 SELECT table_comment,char_length(table_comment) FROM data_dictionary.tables WHERE table_name='t1';
 SELECT column_comment,char_length(column_comment) FROM data_dictionary.columns WHERE table_name='t1';

=== modified file 'tests/t/comments.test'
--- tests/t/comments.test	2009-03-03 07:39:39 +0000
+++ tests/t/comments.test	2010-08-27 21:22:40 +0000
@@ -5,7 +5,7 @@
 select 1+2/*hello*/+3;
 select 1 /* long
 multi line comment */;
---error 1065
+--error ER_EMPTY_QUERY
  ;
 select 1 /*!32301 +1 */;
 select 1 /*!72301 +1 */;

=== modified file 'tests/t/connect.test'
--- tests/t/connect.test	2010-03-03 20:57:45 +0000
+++ tests/t/connect.test	2010-08-27 21:22:40 +0000
@@ -15,7 +15,7 @@
 show tables;
 
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
---error 1049
+--error ER_BAD_DB_ERROR
 connect (fail_con,localhost,root,z,test2);
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
 connect (fail_con,localhost,root,z,);
@@ -30,13 +30,13 @@
 show tables;
 
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
---error 1049
+--error ER_BAD_DB_ERROR
 connect (fail_con,localhost,test,,test2);
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
---error 1049
+--error ER_BAD_DB_ERROR
 connect (fail_con,localhost,test,,"");
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
---error 1049
+--error ER_BAD_DB_ERROR
 connect (fail_con,localhost,test,zorro,test2);
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
 connect (fail_con,localhost,test,zorro,);
@@ -45,13 +45,13 @@
 
 
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
---error 1049
+--error ER_BAD_DB_ERROR
 connect (fail_con,localhost,test,,test2);
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
 connect (fail_con,localhost,test,,);
 --disconnect fail_con
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
---error 1049
+--error ER_BAD_DB_ERROR
 connect (fail_con,localhost,test,zorro,test2);
 --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
 connect (fail_con,localhost,test,zorro,);

=== modified file 'tests/t/create.test'
--- tests/t/create.test	2010-05-20 00:15:10 +0000
+++ tests/t/create.test	2010-08-27 21:22:40 +0000
@@ -14,7 +14,7 @@
 
 create table t1 (b char(0) not null);
 create table if not exists t1 (b char(0) not null);
---error 1048
+--error ER_BAD_NULL_ERROR
 insert into t1 values (""),(null);
 select * from t1;
 drop table t1;
@@ -26,18 +26,18 @@
 # Test of some CREATE TABLE'S that should fail
 #
 
---error 1146
+--error ER_NO_SUCH_TABLE
 create temporary table t2 engine=MEMORY select * from t1;
---error 1146
+--error ER_NO_SUCH_TABLE
 create table t2 select auto+1 from t1;
 drop table if exists t1,t2;
---error 1167
+--error ER_WRONG_KEY_COLUMN
 create table t1 (b char(0) not null, index(b));
---error 1163
+--error ER_TABLE_CANT_HANDLE_BLOB
 create temporary table t1 (a int not null,b text) engine=MEMORY;
 drop table if exists t1;
 
---error 1075
+--error ER_WRONG_AUTO_KEY
 create temporary table t1 (ordid int not null auto_increment, ord  varchar(50) not null, primary key (ord,ordid)) engine=MEMORY;
 
 -- error 1049
@@ -52,30 +52,30 @@
 show create table `t1`;
 drop table `a/a`;
 drop table `t1`;
---error 1103
+--error ER_WRONG_TABLE_NAME
 create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa int);
---error 1059
+--error ER_TOO_LONG_IDENT
 create table a (`aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` int);
 
 #
 # Some wrong defaults, so these creates should fail too (Bug #5902)
 #
---error 1067
+--error ER_INVALID_DEFAULT
 create table t1 (a datetime default now());
---error 1294
+--error ER_INVALID_ON_UPDATE
 create table t1 (a datetime on update now());
---error 1067
+--error ER_INVALID_DEFAULT
 create table t1 (a int default 100 auto_increment);
 # TODO: Should this really fail? What's wrong with default 1000 ???
-#--error 1067
+#--error ER_INVALID_DEFAULT
 #create table t1 (a int default 1000);
---error 1067
+--error ER_INVALID_DEFAULT
 create table t1 (a varchar(5) default 'abcdef');
 
 create table t1 (a varchar(5) default 'abcde');
 insert into t1 values();
 select * from t1;
---error 1067
+--error ER_INVALID_DEFAULT
 alter table t1 alter column a set default 'abcdef';
 drop table t1;
 
@@ -99,13 +99,13 @@
 drop table mysqltest.test2$;
 drop database mysqltest;
 
---error 1103
+--error ER_WRONG_TABLE_NAME
 create table `` (a int);
---error 1103
+--error ER_WRONG_TABLE_NAME
 drop table if exists ``;
---error 1166
+--error ER_WRONG_COLUMN_NAME
 create table t1 (`` int);
---error 1280
+--error ER_WRONG_NAME_FOR_INDEX
 create table t1 (i int, index `` (i)); 
 
 #
@@ -144,13 +144,13 @@
 describe t1;
 describe t2;
 drop table if exists t2;
---error 1060
+--error ER_DUP_FIELDNAME
 create table t2 (a int, a float) select * from t1;               
 drop table if exists t2;
---error 1060
+--error ER_DUP_FIELDNAME
 create table t2 (a int) select a as b, a+1 as b from t1;         
 drop table if exists t2;
---error 1060
+--error ER_DUP_FIELDNAME
 create table t2 (b int) select a as b, a+1 as b from t1;         
 drop table if exists t1,t2;
 
@@ -162,7 +162,7 @@
 INSERT INTO t1 values (1),(2),(1);
 --error ER_DUP_ENTRY
 CREATE TABLE t2 (primary key(a)) SELECT * FROM t1;
---error 1146
+--error ER_NO_SUCH_TABLE
 SELECT * from t2;
 DROP TABLE t1;
 DROP TABLE IF EXISTS t2;
@@ -189,7 +189,7 @@
 CREATE TEMPORARY TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
---error 1286
+--error ER_UNKNOWN_STORAGE_ENGINE
 SET SESSION storage_engine="gemini";
 SELECT @@storage_engine;
 CREATE TEMPORARY TABLE t1 (a int not null);
@@ -203,11 +203,11 @@
 #
 create table t1 ( k1 varchar(2), k2 int, primary key(k1,k2));
 insert into t1 values ("a", 1), ("b", 2);
---error 1048
+--error ER_BAD_NULL_ERROR
 insert into t1 values ("c", NULL);
---error 1048
+--error ER_BAD_NULL_ERROR
 insert into t1 values (NULL, 3);
---error 1048
+--error ER_BAD_NULL_ERROR
 insert into t1 values (NULL, NULL);
 drop table t1;
 
@@ -223,11 +223,11 @@
 #
 
 create table t1 select 1,2,3;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 create table if not exists t1 select 1,2;
---error 1136
+--error ER_WRONG_VALUE_COUNT_ON_ROW
 create table if not exists t1 select 1,2,3,4;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 create table if not exists t1 select 1;
 select * from t1;
 drop table t1;
@@ -256,11 +256,11 @@
 #   "Table truncated when creating another table name with Spaces"
 #
 
---error 1103
+--error ER_WRONG_TABLE_NAME
 create table `t1 `(a int);
---error 1102
+--error ER_WRONG_DB_NAME
 create database `db1 `;
---error 1166
+--error ER_WRONG_COLUMN_NAME
 create table t1(`a ` int);
 
 #
@@ -268,11 +268,11 @@
 #   "Parser permits multiple commas without syntax error"
 #
 
---error 1064
+--error ER_PARSE_ERROR
 create table t1 (a int,);
---error 1064
+--error ER_PARSE_ERROR
 create table t1 (a int,,b int);
---error 1064
+--error ER_PARSE_ERROR
 create table t1 (,b int);
 
 #
@@ -281,7 +281,7 @@
 
 create table t1 (a int, key(a));
 create table t2 (b int, foreign key(b) references t1(a), key(b));
---error 1217
+--error ER_ROW_IS_REFERENCED
 drop table if exists t1,t2;
 drop table if exists t2,t1;
 
@@ -320,15 +320,15 @@
 --replace_regex /ENGINE=[a-zA-Z]+/ENGINE=DEFAULT/
 show create table t2;
 select * from t2;
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 create table t3 like t1;
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 create table t3 like mysqltest.t3;
---error 1049
+--error ER_BAD_DB_ERROR
 create table non_existing_database.t1 like t1;
 --error ER_NO_SUCH_TABLE
 create table t3 like non_existing_table;
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 create temporary table t3 like t1;
 drop table t1, t2, t3;
 drop database mysqltest;
@@ -341,7 +341,7 @@
 CREATE TEMPORARY TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
---error 1286
+--error ER_UNKNOWN_STORAGE_ENGINE
 SET SESSION storage_engine="gemini";
 SELECT @@storage_engine;
 CREATE TEMPORARY TABLE t1 (a int not null);
@@ -412,9 +412,9 @@
 #
 
 create table t1(cenum enum('a'));
---error 1291
+--error ER_DUPLICATED_VALUE_IN_TYPE
 create table t2(cenum enum('a','a'));
---error 1291
+--error ER_DUPLICATED_VALUE_IN_TYPE
 create table t3(cenum enum('a','A','a','c','c'));
 drop table t1;
 
@@ -434,9 +434,9 @@
 #
 
 ## TODO: Is this really a bug? It works in Drizzle. Should it?
-#--error 1280
+#--error ER_WRONG_NAME_FOR_INDEX
 #create table t1 (a int, index `primary` (a));
-#--error 1280
+#--error ER_WRONG_NAME_FOR_INDEX
 #create table t1 (a int, index `PRIMARY` (a));
 #
 #create table t1 (`primary` int, index(`primary`));
@@ -447,9 +447,9 @@
 #show create table t2;
 #
 #create table t3 (a int);
-#--error 1280
+#--error ER_WRONG_NAME_FOR_INDEX
 #alter table t3 add index `primary` (a);
-#--error 1280
+#--error ER_WRONG_NAME_FOR_INDEX
 #alter table t3 add index `PRIMARY` (a);
 #
 #create table t4 (`primary` int);
@@ -485,7 +485,7 @@
 # an improper fix is present.
 #
 create table t1 (a int);
---error 1093
+--error ER_UPDATE_TABLE_USED
 create table t1 select * from t1;
 ## TODO: Huh? --error ER_WRONG_OBJECT
 #create table t2 union = (t1) select * from t1;
@@ -496,11 +496,11 @@
 #
 # Bug#10413: Invalid column name is not rejected
 #
---error 1103
+--error ER_WRONG_TABLE_NAME
 create table t1(column.name int);
---error 1103
+--error ER_WRONG_TABLE_NAME
 create table t1(test.column.name int);
---error 1102
+--error ER_WRONG_DB_NAME
 create table t1(xyz.t1.name int);
 create table t1(t1.name int);
 create table t2(test.t2.name int);
@@ -573,7 +573,7 @@
 show create table t1;
 drop table t1;
 
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 create table t1 ( 
   a varchar(12) collate utf8_bin not null, 
   b int not null, primary key (a)
@@ -1027,7 +1027,7 @@
 # to be rewritten to hit the limit
 #
 # Ensure limit is really 64 keys
---error 1069
+--error ER_TOO_MANY_KEYS
 alter table t1 add key 
  a065_long_123456789_123456789_123456789_123456789_123456789_1234 (
   c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16);
@@ -1041,12 +1041,12 @@
 c16 int, c17 int);
 
 # Get error for max key parts
---error 1070
+--error ER_TOO_MANY_KEY_PARTS
 alter table t1 add key i1 (
  c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16, c17);
 
 # Get error for max key-name length
---error 1059
+--error ER_TOO_LONG_IDENT
 alter table t1 add key 
  a001_long_123456789_123456789_123456789_123456789_123456789_12345 (c1);
 
@@ -1151,24 +1151,24 @@
 # Test incorrect database names
 #
 
---error 1102
+--error ER_WRONG_DB_NAME
 CREATE DATABASE aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
---error 1102
+--error ER_WRONG_DB_NAME
 DROP DATABASE aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
 
 # TODO: enable these tests when RENAME DATABASE is implemented.
-# --error 1049
+# --error ER_BAD_DB_ERROR
 # RENAME DATABASE aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa TO a;
-# --error 1102
+# --error ER_WRONG_DB_NAME
 # RENAME DATABASE mysqltest TO aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
 # create database mysqltest;
-# --error 1102
+# --error ER_WRONG_DB_NAME
 # RENAME DATABASE mysqltest TO aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
 # drop database mysqltest;
 
---error 1102
+--error ER_WRONG_DB_NAME
 USE aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
---error 1102
+--error ER_WRONG_DB_NAME
 SHOW CREATE DATABASE aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;
 
 ##
@@ -1212,12 +1212,12 @@
 #
 # Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA
 #
---error 1005
+--error ER_CANT_CREATE_TABLE
 create table t1 like data_dictionary.processlist;
 create table t1 like data_dictionary.processlist engine=innodb;
 show create table t1;
 drop table t1;
---error 1005
+--error ER_CANT_CREATE_TABLE
 create temporary table t1 like data_dictionary.processlist;
 create temporary table t1 like data_dictionary.processlist engine=myisam;
 show create table t1;
@@ -1314,7 +1314,7 @@
 --echo
 
 CREATE TABLE t3(c1 DATETIME NOT NULL);
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 INSERT INTO t3 VALUES (0);
 
 --echo

=== modified file 'tests/t/create_schema_options.test'
--- tests/t/create_schema_options.test	2010-05-12 21:58:06 +0000
+++ tests/t/create_schema_options.test	2010-08-27 21:22:40 +0000
@@ -1,12 +1,12 @@
---error 1699
+--error ER_UNKNOWN_SCHEMA_OPTION
 CREATE DATABASE foo unknown_key=value;
---error 1699
+--error ER_UNKNOWN_SCHEMA_OPTION
 CREATE DATABASE foo unknown_key=value, anotheR_unknown_key;
 SHOW WARNINGS;
---error 1699
+--error ER_UNKNOWN_SCHEMA_OPTION
 CREATE DATABASE foo unknown_key=42;
 
---error 1699
+--error ER_UNKNOWN_SCHEMA_OPTION
 CREATE DATABASE foo unknown_key;
 
 # These will require us to define schema engines

=== modified file 'tests/t/create_select_column_order.test'
--- tests/t/create_select_column_order.test	2009-05-12 07:37:24 +0000
+++ tests/t/create_select_column_order.test	2010-08-27 21:22:40 +0000
@@ -1,14 +1,14 @@
 create table t1 (a int not null, b int, primary key (a));
 insert into t1 values (1,1);
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 create table if not exists t1 select 2;
 select * from t1;
 drop table t1;
 
 create table t1 select 1,2,3;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 create table if not exists t1 select 1,2;
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 create table if not exists t1 select 1;
 
 select * from t1;

=== modified file 'tests/t/create_select_tmp.test'
--- tests/t/create_select_tmp.test	2009-06-16 00:53:22 +0000
+++ tests/t/create_select_tmp.test	2010-08-27 21:22:40 +0000
@@ -13,19 +13,19 @@
 INSERT INTO t1 VALUES (1),(2),(1);
 --error ER_DUP_ENTRY
 CREATE TABLE t2 ( PRIMARY KEY (a) ) ENGINE=INNODB SELECT a FROM t1;
---error 1146
+--error ER_NO_SUCH_TABLE
 select * from t2;
 --error ER_DUP_ENTRY
 CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=INNODB SELECT a FROM t1;
---error 1146
-select * from t2;
---error ER_DUP_ENTRY
-CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;
---error 1146
-select * from t2;
---error ER_DUP_ENTRY
-CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;
---error 1146
+--error ER_NO_SUCH_TABLE
+select * from t2;
+--error ER_DUP_ENTRY
+CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;
+--error ER_NO_SUCH_TABLE
+select * from t2;
+--error ER_DUP_ENTRY
+CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1;
+--error ER_NO_SUCH_TABLE
 select * from t2;
 drop table t1;
 

=== modified file 'tests/t/create_table_options.test'
--- tests/t/create_table_options.test	2010-05-12 21:58:06 +0000
+++ tests/t/create_table_options.test	2010-08-27 21:22:40 +0000
@@ -1,11 +1,11 @@
---error 1698
+--error ER_UNKNOWN_ENGINE_OPTION
 CREATE TABLE t1 (a int) FOO=BAR, INVALIDFOOBAR=0;
 
---error 1698
+--error ER_UNKNOWN_ENGINE_OPTION
 CREATE TABLE t1 (a int) INVALIDFOOBAR=0;
 
---error 1698
+--error ER_UNKNOWN_ENGINE_OPTION
 CREATE TABLE t1 (a int) INVALIDFOOBAR=foo;
 
---error 1698
+--error ER_UNKNOWN_ENGINE_OPTION
 CREATE TABLE t1 (a int) INVALIDFOOBAR="foa";

=== modified file 'tests/t/ctype_utf8.test'
--- tests/t/ctype_utf8.test	2010-05-12 21:58:06 +0000
+++ tests/t/ctype_utf8.test	2010-08-27 21:22:40 +0000
@@ -117,19 +117,19 @@
 # Bug #2368 Multibyte charsets do not check that incoming data is well-formed
 #
 create table t1 (s1 char(10));
---error 1366
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
 insert into t1 values (0x41FF);
 select hex(s1) from t1;
 drop table t1;
 
 create table t1 (s1 varchar(10));
---error 1366
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
 insert into t1 values (0x41FF);
 select hex(s1) from t1;
 drop table t1;
 
 create table t1 (s1 text);
---error 1366
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
 insert into t1 values (0x41FF);
 select hex(s1) from t1;
 drop table t1;
@@ -138,7 +138,7 @@
 # Bug 2699
 # UTF8 breaks primary keys for cols > 333 characters
 #
---error 1071
+--error ER_TOO_LONG_KEY
 create table t1 (a text, primary key(a(360))) engine=innodb;
 
 #

=== modified file 'tests/t/data_dictionary_like_info.test'
--- tests/t/data_dictionary_like_info.test	2010-07-08 22:17:25 +0000
+++ tests/t/data_dictionary_like_info.test	2010-08-27 21:22:40 +0000
@@ -175,15 +175,15 @@
 --error ER_PARSE_ERROR
 alter database data_dictionary;
 use data_dictionary;
-#--error 1044
+#--error ER_DBACCESS_DENIED_ERROR
 #drop table tables;
-#--error 1044
+#--error ER_DBACCESS_DENIED_ERROR
 #alter table tables;
 #
 # Bug #9683 INFORMATION_SCH: Creation of temporary table allowed in Information_schema DB
 #
 use data_dictionary;
---error 1044
+--error ER_DBACCESS_DENIED_ERROR
 create temporary table schemas(f1 char(10));
 #
 #
@@ -370,9 +370,9 @@
 #
 # Bug#30079 A check for "hidden" I_S tables is flawed
 #
-#--error 1109
+#--error ER_UNKNOWN_TABLE
 #show fields from data_dictionary.table_names;
-#--error 1109
+#--error ER_UNKNOWN_TABLE
 #show keys from data_dictionary.table_names;
 
 SET max_heap_table_size = DEFAULT;

=== modified file 'tests/t/dayofmonth.test'
--- tests/t/dayofmonth.test	2009-01-30 04:01:12 +0000
+++ tests/t/dayofmonth.test	2010-08-27 21:22:40 +0000
@@ -16,9 +16,9 @@
 # Test improper argument list 
 #
 # 1 arg is required.
---error 1582 # Wrong parameter count...
+--error ER_WRONG_PARAMCOUNT_TO_FUNCTION # Wrong parameter count...
 SELECT DAYOFMONTH();
---error 1582 # Wrong parameter count...
+--error ER_WRONG_PARAMCOUNT_TO_FUNCTION # Wrong parameter count...
 SELECT DAYOFMONTH(1, 0);
 
 # 
@@ -26,23 +26,23 @@
 # produce an error, not a NULL or anything
 # else...
 #
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFMONTH("xxx");
 
 # Indy, bad dates!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFMONTH("0000-00-00"); # No 0000-00-00 dates!...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFMONTH("0000-01-01"); # No zero year parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFMONTH("0001-00-01"); # No zero month parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFMONTH("0001-01-00"); # No zero day parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFMONTH("2000-02-30"); # No Feb 30th!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFMONTH("1900-02-29"); # Not a leap DAYOFMONTH since not divisible evenly by 400...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFMONTH('1976-15-15'); # No 15th month!
 
 # A good date, which should output 1

=== modified file 'tests/t/dayofyear.test'
--- tests/t/dayofyear.test	2009-01-30 04:01:12 +0000
+++ tests/t/dayofyear.test	2010-08-27 21:22:40 +0000
@@ -16,9 +16,9 @@
 # Test improper argument list 
 #
 # 1 arg is required.
---error 1582 # Wrong parameter count...
+--error ER_WRONG_PARAMCOUNT_TO_FUNCTION # Wrong parameter count...
 SELECT DAYOFYEAR();
---error 1582 # Wrong parameter count...
+--error ER_WRONG_PARAMCOUNT_TO_FUNCTION # Wrong parameter count...
 SELECT DAYOFYEAR(1, 0);
 
 # 
@@ -26,23 +26,23 @@
 # produce an error, not a NULL or anything
 # else...
 #
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFYEAR("xxx");
 
 # Indy, bad dates!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFYEAR("0000-00-00"); # No 0000-00-00 dates!...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFYEAR("0000-01-01"); # No zero year parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFYEAR("0001-00-01"); # No zero month parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFYEAR("0001-01-00"); # No zero day parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFYEAR("2000-02-30"); # No Feb 30th!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFYEAR("1900-02-29"); # Not a leap DAYOFYEAR since not divisible evenly by 400...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT DAYOFYEAR('1976-15-15'); # No 15th month!
 
 # A good date, which should output 1

=== modified file 'tests/t/default.test'
--- tests/t/default.test	2010-01-08 06:23:08 +0000
+++ tests/t/default.test	2010-08-27 21:22:40 +0000
@@ -103,7 +103,7 @@
 #      multiple-row statement, the preceding rows will have been inserted.
 #
 create table bug20691 (i int, d datetime NOT NULL, dn datetime NULL);
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 insert into bug20691 values (7, DEFAULT, DEFAULT), (7, '1975-07-10 07:10:03', '1978-01-13 14:08:51'), (7, DEFAULT, DEFAULT);
 insert into bug20691 values (7, '1975-07-10 07:10:03', DEFAULT);
 select * from bug20691 order by i asc;
@@ -118,10 +118,10 @@
   i decimal not null,
   x int);
 insert into bug20691 values (3, '0007-01-01', 11, 17, '0019-01-01 00:00:00', 23, 1);
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 insert into bug20691 (x) values (2);
 insert into bug20691 values (3, '0007-01-01', 11, 17, '0019-01-01 00:00:00', 23, 3);
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 insert into bug20691 values (DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, DEFAULT, 4);
 select * from bug20691 order by x asc;
 drop table bug20691;

=== modified file 'tests/t/derived.test'
--- tests/t/derived.test	2010-08-21 22:42:44 +0000
+++ tests/t/derived.test	2010-08-27 21:22:40 +0000
@@ -17,15 +17,15 @@
 CREATE TABLE t3 (a int not null, b char (10) not null);
 insert into t3 values (3,'f'),(4,'y'),(5,'z'),(6,'c');
 select t1.a,t4.y from t1,(select t2.a as y from t2,(select t3.b from t3 where t3.a>3) as t5  where t2.b=t5.b) as t4  where t1.a = t4.y;
---error 1054
+--error ER_BAD_FIELD_ERROR
 SELECT a FROM (SELECT 1 FROM (SELECT 1) a HAVING a=1) b;
---error 1052
+--error ER_NON_UNIQ_ERROR
 SELECT a,b as a FROM (SELECT '1' as a,'2' as b) b  HAVING a=1;
 SELECT a,2 as a FROM (SELECT '1' as a) b HAVING a=2;
 SELECT a,2 as a FROM (SELECT '1' as a) b HAVING a=1;
---error 1054
+--error ER_BAD_FIELD_ERROR
 SELECT 1 FROM (SELECT 1) a WHERE a=2;
---error 1054
+--error ER_BAD_FIELD_ERROR
 SELECT (SELECT 1) as a FROM (SELECT 1 FROM t1  HAVING a=1) as a;
 --sort_result
 select * from t1 as x1, (select * from t1) as x2;
@@ -62,13 +62,13 @@
 drop table t1;
 SELECT * FROM (SELECT (SELECT * FROM (SELECT 1 as a) as a )) as b;
 select * from (select 1 as a) b  left join (select 2 as a) c using(a);
---error 1054
+--error ER_BAD_FIELD_ERROR
 SELECT * FROM (SELECT 1 UNION SELECT a) b;
---error 1054
+--error ER_BAD_FIELD_ERROR
 SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;
---error 1054
+--error ER_BAD_FIELD_ERROR
 SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select 1 from  (select 2) a order by 0;
 
 #
@@ -200,7 +200,7 @@
 #
 CREATE TABLE t1 (a char(10), b char(10));
 INSERT INTO t1 VALUES ('root','localhost'), ('root','%');
---error 1242
+--error ER_SUBQUERY_NO_1_ROW
 SELECT * FROM (SELECT (SELECT a.a FROM t1 AS a WHERE a.a = b.a) FROM t1 AS b) AS c;
 DROP TABLE t1;
 #

=== modified file 'tests/t/drop.test'
--- tests/t/drop.test	2010-03-03 04:58:12 +0000
+++ tests/t/drop.test	2010-08-27 21:22:40 +0000
@@ -6,13 +6,13 @@
 drop database if exists client_test_db;
 --enable_warnings
 
---error 1051
+--error ER_BAD_TABLE_ERROR
 drop table t1;
 create table t1(n int);
 insert into t1 values(1);
 create temporary table t1( n int);
 insert into t1 values(2);
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 create table t1(n int);
 drop table t1;
 select * from t1;
@@ -37,14 +37,14 @@
 # (tableN instead on tN)
 #
 use mysqltest;
---error 1051
+--error ER_BAD_TABLE_ERROR
 drop table table1, table2, table3, table4, table5, table6,
 table7, table8, table9, table10, table11, table12, table13,
 table14, table15, table16, table17, table18, table19, table20,
 table21, table22, table23, table24, table25, table26, table27,
 table28;
 
---error 1051
+--error ER_BAD_TABLE_ERROR
 drop table table1, table2, table3, table4, table5, table6,
 table7, table8, table9, table10, table11, table12, table13,
 table14, table15, table16, table17, table18, table19, table20,
@@ -56,24 +56,24 @@
 
 # test drop/create database and FLUSH TABLES WITH READ LOCK
 flush tables with read lock;
---error 1209,1223
+--error ER_DROP_DB_WITH_READ_LOCK, ER_CANT_UPDATE_WITH_READLOCK
 create database mysqltest;
 unlock tables;
 create database mysqltest;
 show databases;
 flush tables with read lock;
---error 1208,1223
+--error ER_DROP_DB_WITH_READ_LOCK, ER_CANT_UPDATE_WITH_READLOCK
 drop database mysqltest;
 unlock tables;
 drop database mysqltest;
 show databases;
---error 1008
+--error ER_DB_DROP_EXISTS
 drop database mysqltest;
 
 # test create table and FLUSH TABLES WITH READ LOCK
 drop table t1;
 flush tables with read lock;
---error 1223
+--error ER_CANT_UPDATE_WITH_READLOCK
 create table t1(n int);
 unlock tables;
 create table t1(n int);

=== modified file 'tests/t/errors.test'
--- tests/t/errors.test	2008-12-16 07:07:50 +0000
+++ tests/t/errors.test	2010-08-27 21:22:40 +0000
@@ -5,28 +5,28 @@
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
---error 1146
+--error ER_NO_SUCH_TABLE
 insert into t1 values(1);
---error 1146
+--error ER_NO_SUCH_TABLE
 delete from t1;
---error 1146
+--error ER_NO_SUCH_TABLE
 update t1 set a=1;
 create table t1 (a int);
---error 1054
+--error ER_BAD_FIELD_ERROR
 select count(test.t1.b) from t1;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select count(not_existing_database.t1) from t1;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select count(not_existing_database.t1.a) from t1;
---error 1044,1146
+--error ER_DBACCESS_DENIED_ERROR, ER_NO_SUCH_TABLE
 select count(not_existing_database.t1.a) from not_existing_database.t1;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select 1 from t1 order by 2;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select 1 from t1 group by 2;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select 1 from t1 order by t1.b;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select count(*),b from t1;
 drop table t1;
 
@@ -35,9 +35,9 @@
 #
 # Bug #6080: Error message for a field with a display width that is too long
 #
---error 1064
+--error ER_PARSE_ERROR
 create table t1 (a int(256));
---error 1074
+--error ER_TOO_BIG_FIELDLENGTH
 create table t1 (a varchar(66000));
 
 #

=== modified file 'tests/t/explain.test'
--- tests/t/explain.test	2009-06-16 00:53:22 +0000
+++ tests/t/explain.test	2010-08-27 21:22:40 +0000
@@ -15,9 +15,9 @@
 explain select * from t1 use key (str,str) where str="foo";
 
 #The following should give errors
---error 1176
+--error ER_KEY_DOES_NOT_EXITS
 explain select * from t1 use key (str,str,foo) where str="foo";
---error 1176
+--error ER_KEY_DOES_NOT_EXITS
 explain select * from t1 ignore key (str,str,foo) where str="foo";
 drop table t1;
 

=== modified file 'tests/t/flush.test'
--- tests/t/flush.test	2010-03-03 20:57:45 +0000
+++ tests/t/flush.test	2010-08-27 21:22:40 +0000
@@ -29,7 +29,7 @@
 select * from t1;
 connection con2;
 flush tables with read lock;
---error 1223
+--error ER_CANT_UPDATE_WITH_READLOCK
 drop table t2;
 connection con1;
 send drop table t2;

=== modified file 'tests/t/func_date_add.test'
--- tests/t/func_date_add.test	2009-06-16 00:53:22 +0000
+++ tests/t/func_date_add.test	2010-08-27 21:22:40 +0000
@@ -55,9 +55,9 @@
 insert into t1 values (date_add('2000-01-04', INTERVAL NULL DAY));
 # These will all work now, and we'll end up with some NULL entries in the
 # table and some warnings.
---error 1441
+--error ER_DATETIME_FUNCTION_OVERFLOW
 insert into t1 (d) select date_sub('2000-01-01', INTERVAL 2001 YEAR);
---error 1441
+--error ER_DATETIME_FUNCTION_OVERFLOW
 insert into t1 (d) select date_add('2000-01-01',interval 8000 year);
 insert into t1 values (date_add(NULL, INTERVAL 1 DAY));
 insert into t1 values (date_add('2000-01-04', INTERVAL NULL DAY));

=== modified file 'tests/t/func_default.test'
--- tests/t/func_default.test	2008-12-06 22:41:03 +0000
+++ tests/t/func_default.test	2010-08-27 21:22:40 +0000
@@ -25,7 +25,7 @@
 #
 CREATE TABLE t1 (id int, s varchar(20));
 INSERT INTO t1 VALUES (1, 'one'), (2, 'two'), (3, 'three');
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 SELECT s, 32 AS mi FROM t1 GROUP BY s HAVING DEFAULT(mi) IS NULL;
 DROP TABLE t1;
 

=== modified file 'tests/t/func_gconcat.test'
--- tests/t/func_gconcat.test	2009-03-25 09:18:25 +0000
+++ tests/t/func_gconcat.test	2010-08-27 21:22:40 +0000
@@ -69,9 +69,9 @@
 
 # Test errors
 
---error 1111
+--error ER_INVALID_GROUP_FUNC_USE
 select group_concat(sum(c)) from t1 group by grp;
---error 1054
+--error ER_BAD_FIELD_ERROR
 select grp,group_concat(c order by 2) from t1 group by grp;
 
 drop table t1;

=== modified file 'tests/t/func_sapdb.test'
--- tests/t/func_sapdb.test	2009-02-28 17:49:22 +0000
+++ tests/t/func_sapdb.test	2010-08-27 21:22:40 +0000
@@ -33,7 +33,7 @@
 select datediff("1997-11-30 23:59:59.000001","1997-12-31");
 
 # This will give an error
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 select datediff("1997-11-31 23:59:59.000001","1997-12-31");
 select datediff("1997-11-30 23:59:59.000001",null);
 

=== modified file 'tests/t/func_str.test'
--- tests/t/func_str.test	2010-08-18 21:57:15 +0000
+++ tests/t/func_str.test	2010-08-27 21:22:40 +0000
@@ -294,9 +294,9 @@
 #
 
 create table t1 (c1 INT, c2 INT);
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t1 values ('21474836461','21474836461');
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 insert into t1 values ('-21474836461','-21474836461');
 select * from t1;
 drop table t1;
@@ -335,7 +335,7 @@
   PRIMARY KEY  (id)
 ) ENGINE=MyISAM;
 
---error 1264
+--error ER_WARN_DATA_OUT_OF_RANGE
 INSERT INTO t1 VALUES ('0','16307858876001849059');
 
 SELECT CONV('e251273eb74a8ee3', 16, 10);

=== modified file 'tests/t/func_time.test'
--- tests/t/func_time.test	2010-08-21 22:42:44 +0000
+++ tests/t/func_time.test	2010-08-27 21:22:40 +0000
@@ -14,7 +14,7 @@
 select date_format("1997-01-02", concat("%M %W %D ","%Y %y %m %d %h %i %s %w"));
 select dayofmonth("1997-01-02"),dayofmonth(19970323);
 select month("1997-01-02"),year("98-02-03"),dayofyear("1997-12-31");
---error 1686 # No more bad dates!
+--error ER_INVALID_DATETIME_VALUE # No more bad dates!
 select month("2001-02-00"),year("2001-01-01");
 select DAYOFYEAR("1997-03-03"), QUARTER(980303);
 select HOUR("1997-03-03 23:03:22"), MINUTE("23:03:22"), SECOND(230322);
@@ -92,10 +92,10 @@
 select extract(DAY FROM "1999-01-02");
 select extract(DAY_HOUR FROM "1999-01-02 10:11:12");
 # The following is an interval, not a time!
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 select extract(DAY_MINUTE FROM "02 10:11:12");
 # The following is an interval, not a time!
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 select extract(DAY_SECOND FROM "225 10:11:12");
 select extract(HOUR FROM "1999-01-02 10:11:12");
 select extract(HOUR_MINUTE FROM "10:11:12");
@@ -103,7 +103,7 @@
 select extract(MINUTE FROM "10:11:12");
 select extract(MINUTE_SECOND FROM "10:11:12");
 select extract(SECOND FROM "1999-01-02 10:11:12");
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 select extract(MONTH FROM "2001-02-00");
 
 #
@@ -160,9 +160,9 @@
 
 CREATE TEMPORARY TABLE t1 (updated text) ENGINE=MyISAM;
 INSERT INTO t1 VALUES ('');
---error 1686 # "" is not a date!
+--error ER_INVALID_DATETIME_VALUE # "" is not a date!
 SELECT month(updated) from t1;
---error 1686 # "" is not a date for pete's sake.
+--error ER_INVALID_DATETIME_VALUE # "" is not a date for pete's sake.
 SELECT year(updated) from t1;
 drop table t1;
 
@@ -173,21 +173,21 @@
 
 create table t1 (d date, dt datetime, t timestamp, c char(10));
 insert into t1 values (null, null, null, null);
---error 1686 # Bad dates...
+--error ER_INVALID_DATETIME_VALUE # Bad dates...
 insert into t1 values ("0000-00-00", "0000-00-00", "0000-00-00", "0000-00-00");
---error 1686 # 0000-00-00 is a bad date
+--error ER_INVALID_DATETIME_VALUE # 0000-00-00 is a bad date
 select dayofyear("0000-00-00"),dayofyear(d),dayofyear(dt),dayofyear(t),dayofyear(c) from t1;
---error 1686 # 0000-00-00 is a bad date
+--error ER_INVALID_DATETIME_VALUE # 0000-00-00 is a bad date
 select dayofmonth("0000-00-00"),dayofmonth(d),dayofmonth(dt),dayofmonth(t),dayofmonth(c) from t1;
---error 1686 # 0000-00-00 is not a damn date.
+--error ER_INVALID_DATETIME_VALUE # 0000-00-00 is not a damn date.
 select month("0000-00-00"),month(d),month(dt),month(t),month(c) from t1;
---error 1686 # 0000-00-00 not a date
+--error ER_INVALID_DATETIME_VALUE # 0000-00-00 not a date
 select quarter("0000-00-00"),quarter(d),quarter(dt),quarter(t),quarter(c) from t1;
---error 1686 # Argh.  0000-00-00 is not a date.
+--error ER_INVALID_DATETIME_VALUE # Argh.  0000-00-00 is not a date.
 select year("0000-00-00"),year(d),year(dt),year(t),year(c) from t1;
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 select to_days("0000-00-00"),to_days(d),to_days(dt),to_days(c) from t1;
---error 1686 # Ugh. bad datetime
+--error ER_INVALID_DATETIME_VALUE # Ugh. bad datetime
 select extract(MONTH FROM "0000-00-00"),extract(MONTH FROM d),extract(MONTH FROM dt),extract(MONTH FROM t),extract(MONTH FROM c) from t1;
 drop table t1;
 
@@ -243,19 +243,19 @@
 # check for invalid dates
 
 # bad year
---error 1685 # Bad timestamp
+--error ER_INVALID_UNIX_TIMESTAMP_VALUE # Bad timestamp
 select unix_timestamp('2039-01-20 01:00:00');
---error 1685 # Bad timestamp
+--error ER_INVALID_UNIX_TIMESTAMP_VALUE # Bad timestamp
 select unix_timestamp('1968-01-20 01:00:00');
 # bad month
---error 1685 # Bad timestamp
+--error ER_INVALID_UNIX_TIMESTAMP_VALUE # Bad timestamp
 select unix_timestamp('2038-02-10 01:00:00');
---error 1685 # Bad timestamp
+--error ER_INVALID_UNIX_TIMESTAMP_VALUE # Bad timestamp
 select unix_timestamp('1969-11-20 01:00:00');
 # bad day
---error 1685 # Bad timestamp
+--error ER_INVALID_UNIX_TIMESTAMP_VALUE # Bad timestamp
 select unix_timestamp('2038-01-20 01:00:00');
---error 1685 # Bad timestamp
+--error ER_INVALID_UNIX_TIMESTAMP_VALUE # Bad timestamp
 select unix_timestamp('1969-12-30 01:00:00');
 
 #
@@ -358,7 +358,7 @@
 # test for last_day
 select last_day('2000-02-05');
 select last_day('2002-12-31');
---error 1686 # Bad date
+--error ER_INVALID_DATETIME_VALUE # Bad date
 select last_day('2003-03-32');
 select last_day('2003-04-01');
 select last_day('2001-01-01 01:01:01');
@@ -399,11 +399,11 @@
 # Bug #10568
 #
 
---error 1686 # Bad date
+--error ER_INVALID_DATETIME_VALUE # Bad date
 select last_day('2005-00-00');
---error 1686 # Bad date
+--error ER_INVALID_DATETIME_VALUE # Bad date
 select last_day('2005-00-01');
---error 1686 # Bad date
+--error ER_INVALID_DATETIME_VALUE # Bad date
 select last_day('2005-01-00');
 
 #
@@ -426,7 +426,7 @@
 drop table t1;
 
 # check if EXTRACT() handles out-of-range values correctly
---error 1686 # Bad datetime
+--error ER_INVALID_DATETIME_VALUE # Bad datetime
 SELECT EXTRACT(HOUR FROM '100000:02:03');
 
 #
@@ -447,7 +447,7 @@
 # Bug #23653: crash if last_day('0000-00-00')
 #
 
---error 1686 # Bad date
+--error ER_INVALID_DATETIME_VALUE # Bad date
 select last_day('0000-00-00');
 
 --echo End of 4.1 tests

=== modified file 'tests/t/group_by.test'
--- tests/t/group_by.test	2010-08-23 19:49:47 +0000
+++ tests/t/group_by.test	2010-08-27 21:22:40 +0000
@@ -82,7 +82,7 @@
 
 INSERT INTO t1 VALUES (1,'1970-01-01','1997-10-17 00:00:00',2529,1,21000,11886,'check',0,'F',16200,6);
 
---error 1056
+--error ER_WRONG_GROUP_FIELD
 SELECT COUNT(P.URID),SUM(P.amount),P.method, MIN(PP.recdate+0) > 19980501000000   AS IsNew FROM t1 AS P JOIN t1 as PP WHERE P.URID = PP.URID GROUP BY method,IsNew;
 
 drop table t1;
@@ -168,7 +168,7 @@
 #  KEY votes (votes)
 #);
 #
-#--error 1265
+#--error ER_WARN_DATA_TRUNCATED
 #INSERT INTO t1 VALUES (1,0,0,'','normal','','2000-02-10 09:25:12',20000321114747,'','','Linux','P1','TestProduct','PC',3,'other','TestComponent','','M1',0,'',0);
 #INSERT INTO t1 VALUES (9,0,0,'','enhancement','','2000-03-10 11:49:36',20000321114747,'','','All','P5','AAAAA','PC',3,'2.00 CD - Pre','BBBBBBBBBBBBB - conversion','','',0,'',0);
 #INSERT INTO t1 VALUES (10,0,0,'','enhancement','','2000-03-10 18:10:16',20000321114747,'','','All','P4','AAAAA','PC',3,'2.00 CD - Pre','BBBBBBBBBBBBB - conversion','','',0,'',0);

=== modified file 'tests/t/having.test'
--- tests/t/having.test	2009-06-16 00:53:22 +0000
+++ tests/t/having.test	2010-08-27 21:22:40 +0000
@@ -207,7 +207,7 @@
 select count(*) as count_col1 from t1 group by col1 having col1 = 10;
 select count(*) as count_col1 from t1 as tmp1 group by col1 having col1 = 10;
 select count(*) from t1 group by col2 having col2 = 'hello';
---error 1054
+--error ER_BAD_FIELD_ERROR
 select count(*) from t1 group by col2 having col1 = 10;
 select col1 as count_col1 from t1 as tmp1 group by col1 having col1 = 10;
 select col1 as count_col1 from t1 as tmp1 group by col1 having count_col1 = 10;
@@ -221,10 +221,10 @@
 select col1 as count_col1,col2 from t1 as tmp1 group by col1,col2 having count_col1 = 10;
 select col1 as count_col1,col2 from t1 as tmp1 group by col1,col2 having col2 = 'hello';
 select col1 as count_col1,col2 as group_col2 from t1 as tmp1 group by col1,col2 having group_col2 = 'hello';
---error 1064
+--error ER_PARSE_ERROR
 select sum(col1) as co12 from t1 group by col2 having col2 10; 
 select sum(col1) as co2, count(col2) as cc from t1 group by col1 having col1 =10; 
---error 1054
+--error ER_BAD_FIELD_ERROR
 select t2.col2 from t2 group by t2.col1, t2.col2 having t1.col1 <= 10;
 
 
@@ -273,7 +273,7 @@
 
 # nested queries with HAVING, inner having column resolved in outer FROM clause
 # the outer having column is not referenced in GROUP BY which results in an error
---error 1054
+--error ER_BAD_FIELD_ERROR
 select t1.col1 from t1
 where t1.col2 in 
       (select t2.col2 from t2 
@@ -302,7 +302,7 @@
 # correlated subqueries - inner having column 't1.col2' resolves to
 # the outer FROM clause, which cannot be used because the outer query
 # is grouped
---error 1054
+--error ER_BAD_FIELD_ERROR
 select sum(col1) from t1
 group by col_t1
 having col_t1 in (select sum(t2.col1) from t2
@@ -318,11 +318,11 @@
 #
 # queries with joins and ambiguous column names
 #
---error 1052
+--error ER_NON_UNIQ_ERROR
 select t1.col1, t2.col1 from t1, t2 where t1.col1 = t2.col1
 group by t1.col1, t2.col1 having col1 = 2;
 
---error 1052
+--error ER_NON_UNIQ_ERROR
 select t1.col1*10+t2.col1 from t1,t2 where t1.col1=t2.col1
 group by t1.col1, t2.col1 having col1 = 2;
 

=== modified file 'tests/t/heap.test'
--- tests/t/heap.test	2010-06-22 19:48:34 +0000
+++ tests/t/heap.test	2010-08-27 21:22:40 +0000
@@ -215,10 +215,10 @@
 create temporary table t1 (v varchar(10), c char(10), t varchar(50));
 insert into t1 values('+ ', '+ ', '+ ');
 set @a=repeat(' ',20);
---error 1406
+--error ER_DATA_TOO_LONG
 insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
 set @a=repeat(' ',10);
---error 1406
+--error ER_DATA_TOO_LONG
 insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
 set @a=repeat(' ',9);
 insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
@@ -315,7 +315,7 @@
 insert into t1 values ('a '),('a  '),('a   '),('a         ');
 --error ER_DUP_ENTRY
 insert into t1 values ('a     ');
---error 1406
+--error ER_DATA_TOO_LONG
 insert into t1 values ('a          ');
 --error ER_DUP_ENTRY
 insert into t1 values ('a ');
@@ -393,7 +393,7 @@
 insert into t1 values ('a '),('a  '),('a   '),('a         ');
 --error ER_DUP_ENTRY
 insert into t1 values ('a     ');
---error 1406
+--error ER_DATA_TOO_LONG
 insert into t1 values ('a          ');
 --error ER_DUP_ENTRY
 insert into t1 values ('a ');
@@ -436,7 +436,7 @@
 select * from t1;
 drop table t1;
 
---error 1075
+--error ER_WRONG_AUTO_KEY
 create temporary table t1 (a int not null, b int not null auto_increment,
   primary key(a, b)) engine=MEMORY;
 

=== modified file 'tests/t/heap_var.test'
--- tests/t/heap_var.test	2010-05-11 04:37:30 +0000
+++ tests/t/heap_var.test	2010-08-27 21:22:40 +0000
@@ -51,7 +51,7 @@
 
 select count(*) from t1;
 
---error 1062
+--error ER_DUP_ENTRY
 insert into t1 values (100000,100000,NULL,'0123'), (100000,100000,NULL,'0123');
 
 --replace_column 1 #  6 # 7 # 8 # 9 # 10 #

=== modified file 'tests/t/hour.test'
--- tests/t/hour.test	2009-01-30 04:01:12 +0000
+++ tests/t/hour.test	2010-08-27 21:22:40 +0000
@@ -16,11 +16,11 @@
 # Test improper argument list 
 #
 # 1 arg is required.
---error 1064 
+--error ER_PARSE_ERROR 
 # Wrong parameter count...but unfortunately produces 1064 Syntax Error due to limitations of 
 # the SQL parser, which considers HOUR a keyword before being a function symbol
 SELECT HOUR();
---error 1064
+--error ER_PARSE_ERROR
 # Wrong parameter count...but unfortunately produces 1064 Syntax Error due to limitations of 
 # the SQL parser, which considers HOUR a keyword before being a function symbol
 SELECT HOUR(1, 0);
@@ -30,7 +30,7 @@
 # produce an error, not a NULL or anything
 # else...
 #
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT HOUR("xxx");
 
 # 
@@ -39,25 +39,25 @@
 # The following are all bad dates, with no possibility of interpreting
 # the values as TIME-only components.
 #
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT HOUR("0000-00-00"); # No 0000-00-00 dates!...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT HOUR("0000-01-01"); # No zero year parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT HOUR("0001-00-01"); # No zero month parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT HOUR("0001-01-00"); # No zero day parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT HOUR("2000-02-30"); # No Feb 30th!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT HOUR("1900-02-29"); # Not a leap HOUR since not divisible evenly by 400...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT HOUR('1976-15-15'); # No 15th month!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT HOUR('23:59:70'); # No 70th second!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT HOUR('23:70:59'); # No 70th minute!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT HOUR('26:00:00'); # No 26th hour!
 
 # A good date, which cannot be interpreted as a TIME component.  Should return 0.

=== modified file 'tests/t/innodb.test'
--- tests/t/innodb.test	2010-08-24 16:57:49 +0000
+++ tests/t/innodb.test	2010-08-27 21:22:40 +0000
@@ -157,12 +157,12 @@
 select n from t1;
 savepoint savept3;
 rollback to savepoint savept2;
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 rollback to savepoint savept3;
 rollback to savepoint savept2;
 release savepoint `my_savepoint`;
 select n from t1;
--- error 1305
+--error 1305
 rollback to savepoint `my_savepoint`;
 rollback to savepoint savept2;
 insert into t1 values (8);
@@ -184,7 +184,7 @@
 flush tables with read lock;
 #
 # Current code can't handle a read lock in middle of transaction
-#--error 1223;
+#--error ER_CANT_UPDATE_WITH_READLOCK
 commit;
 unlock tables;
 commit;
@@ -540,7 +540,7 @@
 commit;
 drop database mysqltest;
 # Don't check error message
---error 1049
+--error ER_BAD_DB_ERROR
 show tables from mysqltest;
 
 #
@@ -869,7 +869,7 @@
 create index id2 on t2 (id);
 show create table t2;
 drop index id2 on t2;
---error 1025,1025
+--error ER_ERROR_ON_RENAME, ER_ERROR_ON_RENAME
 drop index id on t2;
 show create table t2;
 drop table t2;
@@ -923,22 +923,22 @@
 #
 # Bug #6126: Duplicate columns in keys gives misleading error message
 #
---error 1060
+--error ER_DUP_FIELDNAME
 create table t1 (c char(10), index (c,c)) engine=innodb;
---error 1060
+--error ER_DUP_FIELDNAME
 create table t1 (c1 char(10), c2 char(10), index (c1,c2,c1)) engine=innodb;
---error 1060
+--error ER_DUP_FIELDNAME
 create table t1 (c1 char(10), c2 char(10), index (c1,c1,c2)) engine=innodb;
---error 1060
+--error ER_DUP_FIELDNAME
 create table t1 (c1 char(10), c2 char(10), index (c2,c1,c1)) engine=innodb;
 create table t1 (c1 char(10), c2 char(10)) engine=innodb;
---error 1060
+--error ER_DUP_FIELDNAME
 alter table t1 add key (c1,c1);
---error 1060
+--error ER_DUP_FIELDNAME
 alter table t1 add key (c2,c1,c1);
---error 1060
+--error ER_DUP_FIELDNAME
 alter table t1 add key (c1,c2,c1);
---error 1060
+--error ER_DUP_FIELDNAME
 alter table t1 add key (c1,c1,c2);
 drop table t1;
 
@@ -1197,7 +1197,7 @@
  id INT PRIMARY KEY
 ) ENGINE=InnoDB;
 
---error 1005,1005
+--error ER_CANT_CREATE_TABLE, ER_CANT_CREATE_TABLE
 CREATE TEMPORARY TABLE t2
 (
  id INT NOT NULL PRIMARY KEY,
@@ -1251,16 +1251,16 @@
 drop table t1, t2, t3, t4;
 
 # these should be refused
---error 1071
+--error ER_TOO_LONG_KEY
 create table t1 (col1 varchar(768) primary key)
  engine = innodb;
---error 1071
+--error ER_TOO_LONG_KEY
 create table t2 (col1 varbinary(1024) primary key)
  engine = innodb;
---error 1071
+--error ER_TOO_LONG_KEY
 create table t3 (col1 text, primary key(col1(768)))
  engine = innodb;
---error 1071
+--error ER_TOO_LONG_KEY
 create table t4 (col1 blob, primary key(col1(1024)))
  engine = innodb;
 
@@ -1279,23 +1279,23 @@
  CONSTRAINT c1 FOREIGN KEY (v) REFERENCES t1(id)
 ) ENGINE=InnoDB;
 
---error 1452
+--error ER_NO_REFERENCED_ROW_2
 INSERT INTO t2 VALUES(2);
 
 INSERT INTO t1 VALUES(1);
 INSERT INTO t2 VALUES(1);
 
---error 1451
+--error ER_ROW_IS_REFERENCED_2
 DELETE FROM t1 WHERE id = 1;
 
---error 1217
+--error ER_ROW_IS_REFERENCED
 DROP TABLE t1;
 
 SET FOREIGN_KEY_CHECKS=0;
 DROP TABLE t1;
 SET FOREIGN_KEY_CHECKS=1;
 
---error 1452
+--error ER_NO_REFERENCED_ROW_2
 INSERT INTO t2 VALUES(3);
 
 DROP TABLE t2;
@@ -1580,12 +1580,12 @@
 #
 # S-lock to records (2,2),(4,2), and (6,2) should not be released in a update
 #
---error 1205
+--error ER_LOCK_WAIT_TIMEOUT
 select * from t1 where a = 2 and b = 2 for update;
 #
 # X-lock to record (1,1),(3,1),(5,1) should not be released in a update
 #
---error 1205
+--error ER_LOCK_WAIT_TIMEOUT
 connection a;
 commit;
 connection b;
@@ -1715,39 +1715,39 @@
 create table t10(a int not null, b int, primary key(a)) engine=innodb select * from t2 for update;
 
 connection b;
---error 1205
+--error ER_LOCK_WAIT_TIMEOUT
 reap;
 
 connection c;
---error 1205
+--error ER_LOCK_WAIT_TIMEOUT
 reap;
 
 connection d;
---error 1205
+--error ER_LOCK_WAIT_TIMEOUT
 reap;
 
 connection e;
---error 1205
+--error ER_LOCK_WAIT_TIMEOUT
 reap;
 
 connection f;
---error 1205
+--error ER_LOCK_WAIT_TIMEOUT
 reap;
 
 connection g;
---error 1205
+--error ER_LOCK_WAIT_TIMEOUT
 reap;
 
 connection h;
---error 1205
+--error ER_LOCK_WAIT_TIMEOUT
 reap;
 
 connection i;
---error 1205
+--error ER_LOCK_WAIT_TIMEOUT
 reap;
 
 connection j;
---error 1205
+--error ER_LOCK_WAIT_TIMEOUT
 reap;
 
 connection a;
@@ -1767,7 +1767,7 @@
 drop table t1, t2, t3, t5, t6, t8, t9;
 
 # bug 18934, "InnoDB crashes when table uses column names like DB_ROW_ID"
---error 1005
+--error ER_CANT_CREATE_TABLE
 CREATE TABLE t1 (DB_ROW_ID int) engine=innodb;
 
 #
@@ -1844,7 +1844,7 @@
 --replace_regex /'[^']*test\/#sql-[0-9a-f_]*'/'#sql-temporary'/
 # Embedded server doesn't chdir to data directory
 --replace_result $MYSQLTEST_VARDIR . master-data/ ''
---error 1025
+--error ER_ERROR_ON_RENAME
 ALTER TABLE t2 MODIFY a INT NOT NULL;
 DELETE FROM t1;
 DROP TABLE t2,t1;

=== modified file 'tests/t/insert.test'
--- tests/t/insert.test	2010-04-20 18:23:07 +0000
+++ tests/t/insert.test	2010-08-27 21:22:40 +0000
@@ -33,7 +33,7 @@
 create table t1 (a int not null auto_increment, primary key (a), t timestamp null, c char(10) default "hello", i int);
 insert into t1 values (default,default,default,default);
 insert into t1 values (default,default,default,default);
---error 1685 # Bad timestamp
+--error ER_INVALID_UNIX_TIMESTAMP_VALUE # Bad timestamp
 insert into t1 values (4,0,"a",5);
 insert into t1 values (default,default,default,default);
 select a,t is not null,c,i from t1;
@@ -116,7 +116,7 @@
  }
 enable_query_log;
 select count(*) from t2;
---error 1697
+--error ER_USE_SQL_BIG_RESULT
 insert into  t2 select t1.* from t1, t2 t, t3 where  t1.id1 = t.id2 and t.id2 = t3.id3;
 insert into  t2 select SQL_BIG_RESULT t1.* from t1, t2 t, t3 where  t1.id1 = t.id2 and t.id2 = t3.id3;
 select count(*) from t2;
@@ -131,19 +131,19 @@
 insert into t1 SET a=1, b=a+1;
 insert into t1 (a,b) select 1,2;
 INSERT INTO t1 ( a ) SELECT 0 ON DUPLICATE KEY UPDATE a = a + VALUES (a);
---error 1110
+--error ER_FIELD_SPECIFIED_TWICE
 replace into t1 (a,a) select 100, 'hundred';
---error 1110
+--error ER_FIELD_SPECIFIED_TWICE
 insert into t1 (a,b,b) values (1,1,1);
---error 1136
+--error ER_WRONG_VALUE_COUNT_ON_ROW
 insert into t1 (a,a) values (1,1,1);
---error 1110
+--error ER_FIELD_SPECIFIED_TWICE
 insert into t1 (a,a) values (1,1);
---error 1110
+--error ER_FIELD_SPECIFIED_TWICE
 insert into t1 SET a=1,b=2,a=1;
---error 1110
+--error ER_FIELD_SPECIFIED_TWICE
 insert into t1 (b,b) select 1,2;
---error 1110
+--error ER_FIELD_SPECIFIED_TWICE
 INSERT INTO t1 (b,b) SELECT 0,0 ON DUPLICATE KEY UPDATE a = a + VALUES (a);
 drop table t1;
 

=== modified file 'tests/t/insert_select.test'
--- tests/t/insert_select.test	2010-02-15 18:29:31 +0000
+++ tests/t/insert_select.test	2010-08-27 21:22:40 +0000
@@ -89,7 +89,7 @@
 select * from t1;
 insert into t1 select t2.a from t1,t2;
 select * from t1;
---error 1066
+--error ER_NONUNIQ_TABLE
 insert into t1 select * from t1,t1;
 drop table t1,t2;
 
@@ -194,11 +194,11 @@
 insert into t1 select t2.a from t2 group by t2.a on duplicate key update a= a + 10;
 
 #Some error cases
---error 1052
+--error ER_NON_UNIQ_ERROR
 insert into t1 select t2.a from t2 on duplicate key update a= a + t2.b;
---error 1054
+--error ER_BAD_FIELD_ERROR
 insert into t1 select t2.a from t2 on duplicate key update t2.a= a + t2.b;
---error 1054
+--error ER_BAD_FIELD_ERROR
 insert into t1 select t2.a from t2 group by t2.a on duplicate key update a= t1.a + t2.b;
 drop table t1,t2,t3;
 
@@ -218,9 +218,9 @@
 create table t1(x int, y int);
 create table t2(x int, z int);
 insert into t1(x,y) select x,z from t2 on duplicate key update x=values(x);
---error 1054
+--error ER_BAD_FIELD_ERROR
 insert into t1(x,y) select x,z from t2 on duplicate key update x=values(z);
---error 1054
+--error ER_BAD_FIELD_ERROR
 insert into t1(x,y) select x,z from t2 on duplicate key update x=values(t2.x);
 drop table t1,t2; 
 

=== modified file 'tests/t/insert_update.test'
--- tests/t/insert_update.test	2010-04-05 23:46:43 +0000
+++ tests/t/insert_update.test	2010-08-27 21:22:40 +0000
@@ -93,7 +93,7 @@
 INSERT t1 SET a=5 ON DUPLICATE KEY UPDATE b=0;
 --sorted_result
 SELECT * FROM t1;
---error 1052
+--error ER_NON_UNIQ_ERROR
 INSERT t1 SELECT a,b,c FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=c+VALUES(a);
 INSERT t1 SELECT a,b,c FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=t1.c+VALUES(t1.a);
 --sorted_result
@@ -113,9 +113,9 @@
 select * from t1;
 insert into t1 select 1 on duplicate key update a=2;
 select * from t1;
---error 1052
+--error ER_NON_UNIQ_ERROR
 insert into t1 select a from t1 on duplicate key update a=a+1 ;
---error 1052
+--error ER_NON_UNIQ_ERROR
 insert ignore into t1 select a from t1 on duplicate key update a=t1.a+1 ;
 drop table t1;
 
@@ -187,13 +187,13 @@
 #
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL);
 
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 INSERT INTO t1 (a) VALUES (1);
 
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 INSERT INTO t1 (a) VALUES (1) ON DUPLICATE KEY UPDATE a = b;
 
---error 1364
+--error ER_NO_DEFAULT_FOR_FIELD
 INSERT INTO t1 (a) VALUES (1) ON DUPLICATE KEY UPDATE b = b;
 
 SELECT * FROM t1;
@@ -292,7 +292,7 @@
 SELECT * FROM t1;
 CREATE TABLE t2 (id INT, c1 INT);
 INSERT INTO t2 VALUES (1,NULL), (2,2);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (id,c1) SELECT 1,NULL
   ON DUPLICATE KEY UPDATE c1=NULL;
 SELECT * FROM t1;

=== modified file 'tests/t/join.test'
--- tests/t/join.test	2010-08-21 22:42:44 +0000
+++ tests/t/join.test	2010-08-27 21:22:40 +0000
@@ -113,11 +113,11 @@
 insert into t1 values(1),(2);
 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a);
 --replace_result "31 tables" "XX tables" "61 tables" "XX tables"
---error 1116
+--error ER_TOO_MANY_TABLES
 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a);
 select a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a);
 --replace_result "31 tables" "XX tables" "61 tables" "XX tables"
---error 1116
+--error ER_TOO_MANY_TABLES
 select a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a);
 drop table t1;
 

=== modified file 'tests/t/join_outer.test'
--- tests/t/join_outer.test	2010-08-21 22:42:44 +0000
+++ tests/t/join_outer.test	2010-08-27 21:22:40 +0000
@@ -36,13 +36,13 @@
 select t1.*,t2.*,t3.a from t1 left join t2 on (t1.a=t2.a) left join t1 as t3 on (t2.a=t3.a);
 
 # The next query should rearange the left joins to get this to work
---error 1054
+--error ER_BAD_FIELD_ERROR
 explain select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t1.a=t3.a);
---error 1054
+--error ER_BAD_FIELD_ERROR
 select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t1.a=t3.a);
 
 # The next query should give an error in MySQL
---error 1054
+--error ER_BAD_FIELD_ERROR
 select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t2.a=t3.a);
 
 # Test of inner join
@@ -294,7 +294,7 @@
 insert into t4 values (1,1);
 insert into t5 values (1,1);
 
---error 1054
+--error ER_BAD_FIELD_ERROR
 explain select * from t3 left join t4 on t4.seq_1_id = t2.t2_id left join t1 on t1.t1_id = t4.seq_0_id left join t5 on t5.seq_0_id = t1.t1_id left join t2 on t2.t2_id = t5.seq_1_id where t3.t3_id = 23;
 
 drop table t1,t2,t3,t4,t5;

=== modified file 'tests/t/key.test'
--- tests/t/key.test	2009-11-13 00:56:59 +0000
+++ tests/t/key.test	2010-08-27 21:22:40 +0000
@@ -183,7 +183,7 @@
 #
 
 CREATE TABLE t1 (c VARCHAR(10) NOT NULL,i INT PRIMARY KEY NOT NULL AUTO_INCREMENT, UNIQUE (c,i));
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (c) VALUES (NULL),(NULL);
 SELECT * FROM t1;
 INSERT INTO t1 (c) VALUES ('a'),('a');
@@ -286,29 +286,29 @@
 # create dedicated error code for this and
 # and change my_printf_error() to my_error
 
---error 1391
+--error ER_KEY_PART_0
 create table t1 (c char(10), index (c(0)));
 
 #
 # Bug #6126: Duplicate columns in keys should fail
 # Bug #6252: (dup)
 #
---error 1060
+--error ER_DUP_FIELDNAME
 create table t1 (c char(10), index (c,c));
---error 1060
+--error ER_DUP_FIELDNAME
 create table t1 (c1 char(10), c2 char(10), index (c1,c2,c1));
---error 1060
+--error ER_DUP_FIELDNAME
 create table t1 (c1 char(10), c2 char(10), index (c1,c1,c2));
---error 1060
+--error ER_DUP_FIELDNAME
 create table t1 (c1 char(10), c2 char(10), index (c2,c1,c1));
 create table t1 (c1 char(10), c2 char(10));
---error 1060
+--error ER_DUP_FIELDNAME
 alter table t1 add key (c1,c1);
---error 1060
+--error ER_DUP_FIELDNAME
 alter table t1 add key (c2,c1,c1);
---error 1060
+--error ER_DUP_FIELDNAME
 alter table t1 add key (c1,c2,c1);
---error 1060
+--error ER_DUP_FIELDNAME
 alter table t1 add key (c1,c1,c2);
 drop table t1;
 
@@ -416,7 +416,7 @@
 alter table t1 add primary key (c1, c2), drop primary key;
 alter table t1 drop primary key;
 # Drop is checked first. Primary key must exist.
---error 1091
+--error ER_CANT_DROP_FIELD_OR_KEY
 alter table t1 add primary key (c1, c2), drop primary key;
 show create table t1;
 # Insert non-unique values.

=== modified file 'tests/t/kill.test'
--- tests/t/kill.test	2009-03-27 20:35:31 +0000
+++ tests/t/kill.test	2010-08-27 21:22:40 +0000
@@ -106,7 +106,7 @@
 #kill query $ID;
 #enable_query_log;
 #connection con2;
-#--error 1317
+#--error ER_QUERY_INTERRUPTED
 #reap;
 #select @a;
 #connection con1;
@@ -122,7 +122,7 @@
 #eval kill query $ID;
 #enable_query_log;
 #connection con2;
-#--error 1317
+#--error ER_QUERY_INTERRUPTED
 #reap;
 #select @a;
 #connection con1;
@@ -137,7 +137,7 @@
 #eval kill query $ID;
 #enable_query_log;
 #connection con2;
-#--error 1317
+#--error ER_QUERY_INTERRUPTED
 #reap;
 #select @a;
 #

=== modified file 'tests/t/loaddata.test'
--- tests/t/loaddata.test	2009-02-12 18:16:06 +0000
+++ tests/t/loaddata.test	2010-08-27 21:22:40 +0000
@@ -106,7 +106,7 @@
 load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, b) set c=concat(a,"+",b,"+",@c,"+",b,"+",if(c is null,"NIL",c));
 select * from t1;
 # and this should bark
---error 1409 
+--error ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR 
 load data infile '../std_data_ln/loaddata5.dat' into table t1 fields terminated by '' enclosed by '' (a, @b);
 
 # Now let us test LOAD DATA with subselect
@@ -125,13 +125,13 @@
 show variables like "secure_file_pri%";
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 select @@secure_file_priv;
---error 1238
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
 set @@secure_file_priv= 0;
 
 # Test "load data"
 truncate table t1;
 --replace_result $DRIZZLE_TEST_DIR DRIZZLE_TEST_DIR
---error 1290
+--error ER_OPTION_PREVENTS_STATEMENT
 eval load data infile '$DRIZZLE_TEST_DIR/t/loaddata.test' into table t1;
 select * from t1;
 
@@ -151,7 +151,7 @@
 insert into t2 values(1),(2);
 disable_query_log;
 eval select * into outfile '$MYSQLTEST_VARDIR/tmp/t2' from t2;
---error 1261
+--error ER_WARN_TOO_FEW_RECORDS
 eval load data infile '$MYSQLTEST_VARDIR/tmp/t2' into table t1;
 enable_query_log;
 select f1 from t1 where f2 IS NOT NULL order by f1;
@@ -161,7 +161,7 @@
 eval SELECT * INTO OUTFILE '$MYSQLTEST_VARDIR/tmp/t2'
 FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n'
 FROM t2;
---error 1261
+--error ER_WARN_TOO_FEW_RECORDS
 eval load data infile '$MYSQLTEST_VARDIR/tmp/t2' into table t1
 FIELDS TERMINATED BY '' OPTIONALLY ENCLOSED BY '' LINES TERMINATED BY '\r\n';
 enable_query_log;

=== modified file 'tests/t/lowercase_fs_off.test'
--- tests/t/lowercase_fs_off.test	2008-12-16 17:34:59 +0000
+++ tests/t/lowercase_fs_off.test	2010-08-27 21:22:40 +0000
@@ -11,7 +11,7 @@
 connection sample;
 select database();
 create database d2;
---error 1007
+--error ER_DB_CREATE_EXISTS
 create database D1;
 drop database d2;
 disconnect sample;

=== modified file 'tests/t/microsecond.test'
--- tests/t/microsecond.test	2009-01-30 04:01:12 +0000
+++ tests/t/microsecond.test	2010-08-27 21:22:40 +0000
@@ -16,11 +16,11 @@
 # Test improper argument list 
 #
 # 1 arg is required.
---error 1064 
+--error ER_PARSE_ERROR 
 # Wrong parameter count...but unfortunately produces 1064 Syntax Error due to limitations of 
 # the SQL parser, which considers MICROSECOND a keyword before being a function symbol
 SELECT MICROSECOND();
---error 1064
+--error ER_PARSE_ERROR
 # Wrong parameter count...but unfortunately produces 1064 Syntax Error due to limitations of 
 # the SQL parser, which considers MICROSECOND a keyword before being a function symbol
 SELECT MICROSECOND(1, 0);
@@ -30,7 +30,7 @@
 # produce an error, not a NULL or anything
 # else...
 #
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND("xxx");
 
 # 
@@ -39,27 +39,27 @@
 # The following are all bad dates, with no possibility of interpreting
 # the values as TIME-only components.
 #
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND("0000-00-00"); # No 0000-00-00 dates!...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND("0000-01-01"); # No zero year parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND("0001-00-01"); # No zero month parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND("0001-01-00"); # No zero day parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND("2000-02-30"); # No Feb 30th!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND("1900-02-29"); # Not a leap MICROSECOND since not divisible evenly by 400...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND('1976-15-15'); # No 15th month!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND('23:59:70'); # No 70th second!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND('23:70:59'); # No 70th minute!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND('26:00:00'); # No 26th hour!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MICROSECOND('26:00:00.9999999'); # Microseconds are 6 places, not 7
 
 # A good date, which cannot be interpreted as a TIME component.  Should return 0.

=== modified file 'tests/t/minute.test'
--- tests/t/minute.test	2009-01-30 04:01:12 +0000
+++ tests/t/minute.test	2010-08-27 21:22:40 +0000
@@ -16,11 +16,11 @@
 # Test improper argument list 
 #
 # 1 arg is required.
---error 1064 
+--error ER_PARSE_ERROR 
 # Wrong parameter count...but unfortunately produces 1064 Syntax Error due to limitations of 
 # the SQL parser, which considers MINUTE a keyword before being a function symbol
 SELECT MINUTE();
---error 1064
+--error ER_PARSE_ERROR
 # Wrong parameter count...but unfortunately produces 1064 Syntax Error due to limitations of 
 # the SQL parser, which considers MINUTE a keyword before being a function symbol
 SELECT MINUTE(1, 0);
@@ -30,7 +30,7 @@
 # produce an error, not a NULL or anything
 # else...
 #
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MINUTE("xxx");
 
 # 
@@ -39,25 +39,25 @@
 # The following are all bad dates, with no possibility of interpreting
 # the values as TIME-only components.
 #
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MINUTE("0000-00-00"); # No 0000-00-00 dates!...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MINUTE("0000-01-01"); # No zero year parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MINUTE("0001-00-01"); # No zero month parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MINUTE("0001-01-00"); # No zero day parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MINUTE("2000-02-30"); # No Feb 30th!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MINUTE("1900-02-29"); # Not a leap MINUTE since not divisible evenly by 400...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MINUTE('1976-15-15'); # No 15th month!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MINUTE('23:59:70'); # No 70th second!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MINUTE('23:70:59'); # No 70th minute!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MINUTE('26:00:00'); # No 26th hour!
 
 # A good date, which cannot be interpreted as a TIME component.  Should return 0.

=== modified file 'tests/t/month.test'
--- tests/t/month.test	2009-01-30 04:01:12 +0000
+++ tests/t/month.test	2010-08-27 21:22:40 +0000
@@ -16,11 +16,11 @@
 # Test improper argument list 
 #
 # 1 arg is required.
---error 1064 
+--error ER_PARSE_ERROR 
 # Wrong parameter count...but unfortunately produces 1064 Syntax Error due to limitations of 
 # the SQL parser, which considers MONTH a keyword before being a function symbol
 SELECT MONTH();
---error 1064
+--error ER_PARSE_ERROR
 # Wrong parameter count...but unfortunately produces 1064 Syntax Error due to limitations of 
 # the SQL parser, which considers MONTH a keyword before being a function symbol
 SELECT MONTH(1, 0);
@@ -30,23 +30,23 @@
 # produce an error, not a NULL or anything
 # else...
 #
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MONTH("xxx");
 
 # Indy, bad dates!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MONTH("0000-00-00"); # No 0000-00-00 dates!...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MONTH("0000-01-01"); # No zero year parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MONTH("0001-00-01"); # No zero month parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MONTH("0001-01-00"); # No zero day parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MONTH("2000-02-30"); # No Feb 30th!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MONTH("1900-02-29"); # Not a leap MONTH since not divisible evenly by 400...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT MONTH('1976-15-15'); # No 15th month!
 
 # A good date, which should output 1

=== modified file 'tests/t/null.test'
--- tests/t/null.test	2009-03-25 09:18:25 +0000
+++ tests/t/null.test	2010-08-27 21:22:40 +0000
@@ -65,29 +65,29 @@
 
 # Test INSERT with NULL
 
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (a) values (null);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (a) values (1/null);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (a) values (null),(null);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (b) values (null);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (b) values (1/null);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (b) values (null),(null);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (c) values (null);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (c) values (1/null);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (c) values (null),(null);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (d) values (null);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (d) values (1/null);
---error 1048
+--error ER_BAD_NULL_ERROR
 INSERT INTO t1 (d) values (null),(null);
 
 # Test UPDATE with NULLs
@@ -99,15 +99,15 @@
 # Insert a default row in order to test UPDATE to NULL error
 INSERT INTO t1 VALUES ();
 
---error 1048
+--error ER_BAD_NULL_ERROR
 UPDATE t1 SET a=1/NULL;
---error 1048
+--error ER_BAD_NULL_ERROR
 UPDATE t1 SET a=NULL;
---error 1048
+--error ER_BAD_NULL_ERROR
 UPDATE t1 SET b=NULL;
---error 1048
+--error ER_BAD_NULL_ERROR
 UPDATE t1 SET c=NULL;
---error 1048
+--error ER_BAD_NULL_ERROR
 UPDATE t1 SET d=NULL;
 
 truncate table t1;
@@ -117,7 +117,7 @@
 # as 1048, only gives a "row" number.
 # @TODO Is there really a reason for a separate error 
 # just for LOAD DATA INFILE?
---error 1263
+--error ER_WARN_NULL_TO_NOTNULL
 LOAD DATA INFILE '../std_data_ln/null_test.txt' INTO TABLE t1 FIELDS ENCLOSED BY '"';
 
 drop table t1;
@@ -233,11 +233,11 @@
 #create table bug19145c (e enum('a','b','c') not null default 'b' , s set('x', 'y', 'z') not null default 'y' ) engine=MyISAM;
 
 # Invalid default value for 's'
-#--error 1067
+#--error ER_INVALID_DEFAULT
 #create table bug19145setnotnulldefaultnull (e enum('a','b','c')          default null, s set('x', 'y', 'z') not null default null) engine=MyISAM;
 
 # Invalid default value for 'e'
-#--error 1067
+#--error ER_INVALID_DEFAULT
 #create table bug19145enumnotnulldefaultnull (e enum('a','b','c') not null default null, s set('x', 'y', 'z')          default null) engine=MyISAM;
 
 #alter table bug19145a alter column e set default null;
@@ -249,11 +249,11 @@
 #alter table bug19145b add column (i int);
 
 # Invalid default value for 'e'
-#--error 1067
+#--error ER_INVALID_DEFAULT
 #alter table bug19145c alter column e set default null;
 
 # Invalid default value for 's'
-#--error 1067
+#--error ER_INVALID_DEFAULT
 #alter table bug19145c alter column s set default null;
 #alter table bug19145c add column (i int);
 

=== modified file 'tests/t/null_key.test'
--- tests/t/null_key.test	2009-11-18 22:58:22 +0000
+++ tests/t/null_key.test	2010-08-27 21:22:40 +0000
@@ -28,7 +28,7 @@
 select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
 select * from t1 where a > 1 and a < 3 limit 1;
 select * from t1 where a > 8 and a < 9;
---error 1005
+--error ER_CANT_CREATE_TABLE
 create table t2 like t1;
 create temporary table t2 like t1;
 show create table t2;
@@ -230,7 +230,7 @@
   index (id),
   index (id2)
 );
---error 1048
+--error ER_BAD_NULL_ERROR
 insert into t1 values(null,null),(1,1);
 select * from t1;
 select * from t1 where id <=> null;

=== modified file 'tests/t/olap.test'
--- tests/t/olap.test	2008-12-19 21:34:33 +0000
+++ tests/t/olap.test	2010-08-27 21:22:40 +0000
@@ -72,11 +72,11 @@
 # Error handling
 
 # Cube is not yet implemented
---error 1064
+--error ER_PARSE_ERROR
 select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube;
---error 1064
+--error ER_PARSE_ERROR
 explain select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube;
---error 1064
+--error ER_PARSE_ERROR
 select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube union all select product, country_id , year, sum(profit) from t1 group by product, country_id, year with rollup;
 
 drop table t1,t2;

=== modified file 'tests/t/optimizer.test'
--- tests/t/optimizer.test	2010-08-21 04:05:07 +0000
+++ tests/t/optimizer.test	2010-08-27 21:22:40 +0000
@@ -421,7 +421,7 @@
 
 INSERT INTO `dd` VALUES (1777795072,NULL,'g',0,'was',-1866203136,'',1,'g');
 
---error 1054
+--error ER_BAD_FIELD_ERROR
 EXPLAIN EXTENDED SELECT
 table2 . `col_enum_not_null_key` AS field1 ,
  table1 . `col_char_1024_key` AS field2

=== modified file 'tests/t/order_by.test'
--- tests/t/order_by.test	2010-05-12 22:54:08 +0000
+++ tests/t/order_by.test	2010-08-27 21:22:40 +0000
@@ -474,17 +474,17 @@
 # Let us also test various ambiguos and potentially ambiguos cases 
 # related to aliases
 #
---error 1052
+--error ER_NON_UNIQ_ERROR
 select col1 as col, col from t1 order by col;
---error 1052
-select t1.col as c1, t2.col as c2 from t1, t2 where t1.col1=t2.col2
-  order by col;
---error 1052
-select t1.col as c1, t2.col as c2 from t1, t2 where t1.col1=t2.col2
-  order by col;
---error 1052
+--error ER_NON_UNIQ_ERROR
+select t1.col as c1, t2.col as c2 from t1, t2 where t1.col1=t2.col2
+  order by col;
+--error ER_NON_UNIQ_ERROR
+select t1.col as c1, t2.col as c2 from t1, t2 where t1.col1=t2.col2
+  order by col;
+--error ER_NON_UNIQ_ERROR
 select col1 from t1, t2 where t1.col1=t2.col2 order by col;
---error 1052
+--error ER_NON_UNIQ_ERROR
 select t1.col as t1_col, t2.col2 from t1, t2 where t1.col1=t2.col2
   order by col;
 
@@ -580,10 +580,10 @@
 SELECT CONCAT('test', a) AS str FROM t1 ORDER BY UPPER(str);
 SELECT a + 1 AS num FROM t1 GROUP BY 30 - num;
 SELECT a + 1 AS num FROM t1 HAVING 30 - num;
---error 1054
+--error ER_BAD_FIELD_ERROR
 SELECT a + 1 AS num, num + 1 FROM t1;
 SELECT a + 1 AS num, (select num + 2 FROM t1 LIMIT 1) FROM t1;
---error 1054
+--error ER_BAD_FIELD_ERROR
 SELECT a.a + 1 AS num FROM t1 a JOIN t1 b ON num = b.a;
 DROP TABLE t1;
 
@@ -594,25 +594,25 @@
 CREATE TABLE bug25126 (
   val int NOT NULL AUTO_INCREMENT PRIMARY KEY
 );
---error 1054
+--error ER_BAD_FIELD_ERROR
 UPDATE bug25126 SET MissingCol = MissingCol;
---error 1054
+--error ER_BAD_FIELD_ERROR
 UPDATE bug25126 SET val = val ORDER BY MissingCol;
 UPDATE bug25126 SET val = val ORDER BY val;
 UPDATE bug25126 SET val = 1 ORDER BY val;
---error 1054
+--error ER_BAD_FIELD_ERROR
 UPDATE bug25126 SET val = 1 ORDER BY MissingCol;
---error 1054
+--error ER_BAD_FIELD_ERROR
 UPDATE bug25126 SET val = 1 ORDER BY val, MissingCol;
---error 1054
+--error ER_BAD_FIELD_ERROR
 UPDATE bug25126 SET val = MissingCol ORDER BY MissingCol;
---error 1054
+--error ER_BAD_FIELD_ERROR
 UPDATE bug25126 SET MissingCol = 1 ORDER BY val, MissingCol;
---error 1054
+--error ER_BAD_FIELD_ERROR
 UPDATE bug25126 SET MissingCol = 1 ORDER BY MissingCol;
---error 1054
+--error ER_BAD_FIELD_ERROR
 UPDATE bug25126 SET MissingCol = val ORDER BY MissingCol;
---error 1054
+--error ER_BAD_FIELD_ERROR
 UPDATE bug25126 SET MissingCol = MissingCol ORDER BY MissingCol;
 DROP TABLE bug25126;
 
@@ -624,9 +624,9 @@
 CREATE TABLE t1 (a int);
 
 SELECT p.a AS val, q.a AS val1 FROM t1 p, t1 q ORDER BY val > 1;
---error 1052
+--error ER_NON_UNIQ_ERROR
 SELECT p.a AS val, q.a AS val FROM t1 p, t1 q ORDER BY val;
---error 1052
+--error ER_NON_UNIQ_ERROR
 SELECT p.a AS val, q.a AS val FROM t1 p, t1 q ORDER BY val > 1;
 
 DROP TABLE t1;
@@ -742,14 +742,14 @@
 INSERT INTO t1 SELECT a +32, b +32 FROM t1;
 INSERT INTO t1 SELECT a +64, b +64 FROM t1;
 
---error 1176
+--error ER_KEY_DOES_NOT_EXITS
 SELECT a FROM t1 IGNORE INDEX FOR GROUP BY (a, ab) GROUP BY a;
 
 SELECT a FROM t1 IGNORE INDEX FOR GROUP BY (primary, ab) GROUP BY a;
 
 SELECT @tmp_tables_after = @tmp_tables_before ;
 
---error 1176
+--error ER_KEY_DOES_NOT_EXITS
 SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (a, ab) ORDER BY a;
 SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (primary, ab) ORDER BY a;
 

=== modified file 'tests/t/outfile.test'
--- tests/t/outfile.test	2010-02-24 23:10:30 +0000
+++ tests/t/outfile.test	2010-08-27 21:22:40 +0000
@@ -31,13 +31,13 @@
 # the following should give errors
 
 disable_query_log;
---error 1086
+--error ER_FILE_EXISTS_ERROR
 eval select * into outfile "../tmp/outfile-test.1" from t1;
 
---error 1086
+--error ER_FILE_EXISTS_ERROR
 eval select * into dumpfile "../tmp/outfile-test.2" from t1;
 
---error 1086
+--error ER_FILE_EXISTS_ERROR
 eval select * into dumpfile "../tmp/outfile-test.3" from t1;
 enable_query_log;
 select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
@@ -92,6 +92,6 @@
 # It should not be possible to write to a file outside of vardir
 create table t1(a int);
 --replace_result $DRIZZLE_TEST_DIR DRIZZLE_TEST_DIR
---error 1290
+--error ER_OPTION_PREVENTS_STATEMENT
 eval select * into outfile "$DRIZZLE_TEST_DIR/outfile-test1" from t1;
 drop table t1;

=== modified file 'tests/t/parser.test'
--- tests/t/parser.test	2010-06-24 05:34:43 +0000
+++ tests/t/parser.test	2010-08-27 21:22:40 +0000
@@ -589,7 +589,7 @@
 # MySQL didn't follow the SQL standard on CROSS. INNER requires ON, but
 # CROSS does not make use of ON.
 #
---error 1064 
+--error ER_PARSE_ERROR 
 SELECT t1.*,t2.* FROM { OJ (t1 LEFT OUTER JOIN t2 ON t1.a1=t2.a2) CROSS JOIN t3 ON (t3.a2=t2.a3)};
 SELECT t1.*,t2.* FROM { OJ (t1 LEFT OUTER JOIN t2 ON t1.a1=t2.a2) INNER JOIN t3 ON (t3.a2=t2.a3)};
 SELECT * FROM {oj t1 LEFT OUTER JOIN t2 ON t1.a1=t2.a3} WHERE t1.a2 > 10;

=== modified file 'tests/t/plugin-remove.test'
--- tests/t/plugin-remove.test	2010-02-05 20:19:10 +0000
+++ tests/t/plugin-remove.test	2010-08-27 21:22:40 +0000
@@ -1,3 +1,3 @@
---error 1305
+--error ER_SP_DOES_NOT_EXIST
 select length("test string");
 

=== modified file 'tests/t/quarter.test'
--- tests/t/quarter.test	2009-01-30 04:38:21 +0000
+++ tests/t/quarter.test	2010-08-27 21:22:40 +0000
@@ -16,11 +16,11 @@
 # Test improper argument list 
 #
 # 1 arg is required.
---error 1064 
+--error ER_PARSE_ERROR 
 # Wrong parameter count...but unfortunately produces 1064 Syntax Error due to limitations of 
 # the SQL parser, which considers QUARTER a keyword before being a function symbol
 SELECT QUARTER();
---error 1064
+--error ER_PARSE_ERROR
 # Wrong parameter count...but unfortunately produces 1064 Syntax Error due to limitations of 
 # the SQL parser, which considers QUARTER a keyword before being a function symbol
 SELECT QUARTER(1, 0);
@@ -30,23 +30,23 @@
 # produce an error, not a NULL or anything
 # else...
 #
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT QUARTER("xxx");
 
 # Indy, bad dates!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT QUARTER("0000-00-00"); # No 0000-00-00 dates!...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT QUARTER("0000-01-01"); # No zero year parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT QUARTER("0001-00-01"); # No zero month parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT QUARTER("0001-01-00"); # No zero day parts
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT QUARTER("2000-02-30"); # No Feb 30th!
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT QUARTER("1900-02-29"); # Not a leap QUARTER since not divisible evenly by 400...
---error 1686
+--error ER_INVALID_DATETIME_VALUE
 SELECT QUARTER('1976-15-15'); # No 15th month!
 
 # A good date, which should output 1

=== modified file 'tests/t/regression_385808.test'
--- tests/t/regression_385808.test	2010-05-21 18:39:01 +0000
+++ tests/t/regression_385808.test	2010-08-27 21:22:40 +0000
@@ -32,10 +32,10 @@
 
 CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY)
   SELECT a FROM t1;
---error 1062
+--error ER_DUP_ENTRY
 CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY)
   SELECT a FROM t1;
---error 1062
+--error ER_DUP_ENTRY
 CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY)
   SELECT a FROM t1;
 

=== modified file 'tests/t/rename.test'
--- tests/t/rename.test	2008-12-18 23:54:47 +0000
+++ tests/t/rename.test	2010-08-27 21:22:40 +0000
@@ -19,14 +19,14 @@
 select * from t1;
 
 # The following should give errors
---error 1050,1050
+--error ER_TABLE_EXISTS_ERROR, ER_TABLE_EXISTS_ERROR
 rename table t1 to t2;
---error 1050,1050
+--error ER_TABLE_EXISTS_ERROR, ER_TABLE_EXISTS_ERROR
 rename table t1 to t1;
---error 1050,1050
+--error ER_TABLE_EXISTS_ERROR, ER_TABLE_EXISTS_ERROR
 rename table t3 to t4, t2 to t3, t1 to t2, t4 to t2;
 show tables like "t_";
---error 1050,1050
+--error ER_TABLE_EXISTS_ERROR, ER_TABLE_EXISTS_ERROR
 rename table t3 to t1, t2 to t3, t1 to t2, t4 to t1;
 --error ER_NO_SUCH_TABLE
 rename table t3 to t4, t5 to t3, t1 to t2, t4 to t1;
@@ -36,4 +36,4 @@
 select * from t3;
 
 # This should give a warning for t4
-drop table if exists t1,t2,t3,t4;
\ No newline at end of file
+drop table if exists t1,t2,t3,t4;