List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:March 15 2012 9:56am
Subject:bzr push into mysql-trunk branch (jon.hauglid:3778 to 3779) Bug#13833438
View as plain text  
 3779 Jon Olav Hauglid	2012-03-15
      Bug#13833438 ERROR CODES MUST HAVE SAME VALUE ACROSS MYSQL VERSIONS
      
      All MySQL error numbers should be stable between major versions
      as this allows client applications to handle errors based on
      error number without rebuilding/rewriting between MySQL versions.
      
      MySQL error numbers are determined by the order MySQL errors
      are listed in errmsg-utf8.txt.
      
      This patch reorders the MySQL errors so that new errors
      introduced in 5.6 are listed last and that MySQL errors
      also present in 5.5 are listed in the same order so that they
      keep their error number.

    modified:
      mysql-test/r/cast.result
      mysql-test/r/explain.result
      mysql-test/r/get_diagnostics.result
      mysql-test/r/innodb_explain_json_non_select_all.result
      mysql-test/r/innodb_explain_json_non_select_none.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_explain_non_select_none.result
      mysql-test/r/myisam_explain_json_non_select_all.result
      mysql-test/r/myisam_explain_json_non_select_none.result
      mysql-test/r/myisam_explain_non_select_all.result
      mysql-test/r/myisam_explain_non_select_none.result
      mysql-test/r/packet.result
      mysql-test/r/partition_exchange.result
      mysql-test/r/read_only_innodb.result
      mysql-test/r/shm.result
      mysql-test/r/sp-destruct.result
      mysql-test/r/type_time.result
      mysql-test/r/variables-notembedded.result
      mysql-test/r/variables.result
      mysql-test/suite/innodb/r/innodb_16k.result
      mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
      mysql-test/suite/rpl/r/rpl_alter_repository.result
      mysql-test/suite/rpl/r/rpl_heartbeat.result
      mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/t/rpl_alter_repository.test
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
      mysql-test/suite/sys_vars/r/max_allowed_packet_func.result
      mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
      mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
      sql/share/errmsg-utf8.txt
 3778 Jon Olav Hauglid	2012-03-15 [merge]
      Null-merge from mysql-5.5 to mysql-trunk

=== modified file 'mysql-test/r/cast.result'
--- a/mysql-test/r/cast.result	2011-11-01 11:52:24 +0000
+++ b/mysql-test/r/cast.result	2012-03-15 09:55:15 +0000
@@ -456,7 +456,7 @@ DROP TABLE t1;
 #   DOESN'T ADHERE TO MAX_ALLOWED_PACKET
 SET @@GLOBAL.max_allowed_packet=2048;
 Warnings:
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SELECT CONVERT('a', BINARY(2049));
 CONVERT('a', BINARY(2049))
 NULL

=== modified file 'mysql-test/r/explain.result'
--- a/mysql-test/r/explain.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/explain.result	2012-03-15 09:55:15 +0000
@@ -414,8 +414,8 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	index	PRIMARY	PRIMARY	1	NULL	5	100.00	Using where; Using index
 Warnings:
-Warning	1713	Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url'
-Warning	1713	Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url'
+Warning	1736	Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url'
+Warning	1736	Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url'
 Note	1003	/* select#1 */ select `test`.`t1`.`url` AS `url` from `test`.`t1` where (`test`.`t1`.`url` = 1)
 
 # Test that index can't be used for lookup due to collation mismatch
@@ -426,8 +426,8 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	index	PRIMARY	PRIMARY	1	NULL	5	100.00	Using where; Using index
 Warnings:
-Warning	1713	Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url'
-Warning	1713	Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url'
+Warning	1736	Cannot use ref access on index 'PRIMARY' due to type or collation conversion on field 'url'
+Warning	1736	Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url'
 Note	1003	/* select#1 */ select `test`.`t1`.`url` AS `url` from `test`.`t1` where (`test`.`t1`.`url` = <cache>(('1' collate latin1_german2_ci)))
 
 # Normally, range access on primary key is done
@@ -447,7 +447,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	index	PRIMARY	PRIMARY	1	NULL	5	100.00	Using where; Using index
 Warnings:
-Warning	1713	Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url'
+Warning	1736	Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url'
 Note	1003	/* select#1 */ select `test`.`t1`.`url` AS `url` from `test`.`t1` where (`test`.`t1`.`url` > 3)
 
 # Test that range access on index can't be done due to collation mismatch
@@ -459,7 +459,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	index	PRIMARY	PRIMARY	1	NULL	5	100.00	Using where; Using index
 Warnings:
-Warning	1713	Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url'
+Warning	1736	Cannot use range access on index 'PRIMARY' due to type or collation conversion on field 'url'
 Note	1003	/* select#1 */ select `test`.`t1`.`url` AS `url` from `test`.`t1` where (`test`.`t1`.`url` > <cache>(('3' collate latin1_german2_ci)))
 
 DROP TABLE t1;

=== modified file 'mysql-test/r/get_diagnostics.result'
--- a/mysql-test/r/get_diagnostics.result	2011-10-14 15:38:24 +0000
+++ b/mysql-test/r/get_diagnostics.result	2012-03-15 09:55:15 +0000
@@ -232,26 +232,26 @@ GET DIAGNOSTICS CONDITION "1" @var = CLA
 SELECT COUNT(max_questions) INTO @var FROM mysql.user;
 GET DIAGNOSTICS CONDITION 9999 @var = CLASS_ORIGIN;
 Warnings:
-Error	1753	Invalid condition number
+Error	1755	Invalid condition number
 GET DIAGNOSTICS CONDITION NULL @var = CLASS_ORIGIN;
 Warnings:
-Error	1753	Invalid condition number
-Error	1753	Invalid condition number
+Error	1755	Invalid condition number
+Error	1755	Invalid condition number
 GET DIAGNOSTICS CONDITION a @var = CLASS_ORIGIN;
 Warnings:
-Error	1753	Invalid condition number
-Error	1753	Invalid condition number
+Error	1755	Invalid condition number
+Error	1755	Invalid condition number
 Error	1054	Unknown column 'a' in 'field list'
 SELECT COUNT(max_questions) INTO @var FROM mysql.user;
 SET @cond = 1;
 GET DIAGNOSTICS CONDITION @cond @var1 = CLASS_ORIGIN;
 Warnings:
-Error	1753	Invalid condition number
+Error	1755	Invalid condition number
 SET @cond = "invalid";
 GET DIAGNOSTICS CONDITION @cond @var1 = CLASS_ORIGIN;
 Warnings:
-Error	1753	Invalid condition number
-Error	1753	Invalid condition number
+Error	1755	Invalid condition number
+Error	1755	Invalid condition number
 SELECT COUNT(max_questions) INTO @var FROM mysql.user;
 CREATE PROCEDURE p1()
 BEGIN
@@ -301,11 +301,11 @@ Warning	1292	Truncated incorrect DECIMAL
 GET DIAGNOSTICS CONDITION 99999 @var = CLASS_ORIGIN;
 Warnings:
 Warning	1292	Truncated incorrect DECIMAL value: ''
-Error	1753	Invalid condition number
+Error	1755	Invalid condition number
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1292	Truncated incorrect DECIMAL value: ''
-Error	1753	Invalid condition number
+Error	1755	Invalid condition number
 
 # Statement information runtime
 
@@ -488,14 +488,14 @@ CALL p1();
 CAST(-19999999999999999999 AS SIGNED)	-9223372036854775808
 errno1	1292
 msg1	Truncated incorrect DECIMAL value: ''
-errno2	1753
+errno2	1755
 msg2	Invalid condition number
 Warnings:
 Level	Warning
 Code	1292
 Message	Truncated incorrect DECIMAL value: ''
 Level	Error
-Code	1753
+Code	1755
 Message	Invalid condition number
 DROP PROCEDURE p1;
 

=== modified file 'mysql-test/r/innodb_explain_json_non_select_all.result'
--- a/mysql-test/r/innodb_explain_json_non_select_all.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/innodb_explain_json_non_select_all.result	2012-03-15 09:55:15 +0000
@@ -2852,8 +2852,8 @@ EXPLAIN EXTENDED DELETE   FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t1 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;;
@@ -2878,18 +2878,18 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t1 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -2914,10 +2914,10 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of "equivalent" SELECT query execution:
 Variable_name	Value
@@ -3133,7 +3133,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -3158,7 +3158,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -3226,7 +3226,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -3251,7 +3251,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -3758,8 +3758,8 @@ EXPLAIN EXTENDED UPDATE t2 SET a = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET a = 10 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;;
@@ -3784,18 +3784,18 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -3820,10 +3820,10 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of "equivalent" SELECT query execution:
 Variable_name	Value
@@ -4041,7 +4041,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -4066,7 +4066,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -4134,7 +4134,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -4159,7 +4159,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE b = 10 ORDER BY a, c LIMIT 5;

=== modified file 'mysql-test/r/innodb_explain_json_non_select_none.result'
--- a/mysql-test/r/innodb_explain_json_non_select_none.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/innodb_explain_json_non_select_none.result	2012-03-15 09:55:15 +0000
@@ -2869,8 +2869,8 @@ EXPLAIN EXTENDED DELETE   FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t1 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;;
@@ -2895,18 +2895,18 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t1 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -2931,10 +2931,10 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of "equivalent" SELECT query execution:
 Variable_name	Value
@@ -3150,7 +3150,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -3175,7 +3175,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -3243,7 +3243,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -3268,7 +3268,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -3775,8 +3775,8 @@ EXPLAIN EXTENDED UPDATE t2 SET a = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET a = 10 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;;
@@ -3801,18 +3801,18 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -3837,10 +3837,10 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of "equivalent" SELECT query execution:
 Variable_name	Value
@@ -4058,7 +4058,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -4083,7 +4083,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -4151,7 +4151,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -4176,7 +4176,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE b = 10 ORDER BY a, c LIMIT 5;

=== modified file 'mysql-test/r/innodb_explain_non_select_all.result'
--- a/mysql-test/r/innodb_explain_non_select_all.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/innodb_explain_non_select_all.result	2012-03-15 09:55:15 +0000
@@ -1312,8 +1312,8 @@ EXPLAIN EXTENDED DELETE   FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1322,10 +1322,10 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -1459,7 +1459,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1510,7 +1510,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1780,8 +1780,8 @@ EXPLAIN EXTENDED UPDATE t2 SET a = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1790,10 +1790,10 @@ EXPLAIN EXTENDED SELECT * FROM t2     WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -1928,7 +1928,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1979,7 +1979,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;

=== modified file 'mysql-test/r/innodb_explain_non_select_none.result'
--- a/mysql-test/r/innodb_explain_non_select_none.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/innodb_explain_non_select_none.result	2012-03-15 09:55:15 +0000
@@ -1314,8 +1314,8 @@ EXPLAIN EXTENDED DELETE   FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1324,10 +1324,10 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -1461,7 +1461,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1512,7 +1512,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1782,8 +1782,8 @@ EXPLAIN EXTENDED UPDATE t2 SET a = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1792,10 +1792,10 @@ EXPLAIN EXTENDED SELECT * FROM t2     WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -1930,7 +1930,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1981,7 +1981,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;

=== modified file 'mysql-test/r/myisam_explain_json_non_select_all.result'
--- a/mysql-test/r/myisam_explain_json_non_select_all.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/myisam_explain_json_non_select_all.result	2012-03-15 09:55:15 +0000
@@ -2754,8 +2754,8 @@ EXPLAIN EXTENDED DELETE   FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t1 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;;
@@ -2780,18 +2780,18 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t1 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -2816,10 +2816,10 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of "equivalent" SELECT query execution:
 Variable_name	Value
@@ -3025,7 +3025,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -3050,7 +3050,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -3114,7 +3114,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -3139,7 +3139,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -3643,8 +3643,8 @@ EXPLAIN EXTENDED UPDATE t2 SET a = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET a = 10 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;;
@@ -3669,18 +3669,18 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -3705,10 +3705,10 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of "equivalent" SELECT query execution:
 Variable_name	Value
@@ -3916,7 +3916,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -3941,7 +3941,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -4004,7 +4004,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -4029,7 +4029,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE b = 10 ORDER BY a, c LIMIT 5;

=== modified file 'mysql-test/r/myisam_explain_json_non_select_none.result'
--- a/mysql-test/r/myisam_explain_json_non_select_none.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/myisam_explain_json_non_select_none.result	2012-03-15 09:55:15 +0000
@@ -2769,8 +2769,8 @@ EXPLAIN EXTENDED DELETE   FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t1 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;;
@@ -2795,18 +2795,18 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t1 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -2831,10 +2831,10 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of "equivalent" SELECT query execution:
 Variable_name	Value
@@ -3040,7 +3040,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -3065,7 +3065,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -3129,7 +3129,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON DELETE   FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -3154,7 +3154,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2 WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -3658,8 +3658,8 @@ EXPLAIN EXTENDED UPDATE t2 SET a = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET a = 10 WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;;
@@ -3684,18 +3684,18 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE i > 10 AND i <= 18 ORDER BY i LIMIT 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -3720,10 +3720,10 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of "equivalent" SELECT query execution:
 Variable_name	Value
@@ -3931,7 +3931,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -3956,7 +3956,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE b = 10 ORDER BY a, c LIMIT 5;
@@ -4019,7 +4019,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 EXPLAIN FORMAT=JSON UPDATE t2 SET d = 10 WHERE b = 10 ORDER BY a, c LIMIT 5;;
@@ -4044,7 +4044,7 @@ EXPLAIN
   } /* query_block */
 }
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 FLUSH STATUS;
 FLUSH TABLES;
 EXPLAIN EXTENDED SELECT * FROM t2     WHERE b = 10 ORDER BY a, c LIMIT 5;

=== modified file 'mysql-test/r/myisam_explain_non_select_all.result'
--- a/mysql-test/r/myisam_explain_non_select_all.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/myisam_explain_non_select_all.result	2012-03-15 09:55:15 +0000
@@ -1227,8 +1227,8 @@ EXPLAIN EXTENDED DELETE   FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1237,10 +1237,10 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -1364,7 +1364,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1411,7 +1411,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1674,8 +1674,8 @@ EXPLAIN EXTENDED UPDATE t2 SET a = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1684,10 +1684,10 @@ EXPLAIN EXTENDED SELECT * FROM t2     WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -1812,7 +1812,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1858,7 +1858,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;

=== modified file 'mysql-test/r/myisam_explain_non_select_none.result'
--- a/mysql-test/r/myisam_explain_non_select_none.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/myisam_explain_non_select_none.result	2012-03-15 09:55:15 +0000
@@ -1227,8 +1227,8 @@ EXPLAIN EXTENDED DELETE   FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1237,10 +1237,10 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`i` AS `i` from `test`.`t1` where ((`test`.`t1`.`i` > 10) and (`test`.`t1`.`i` <= 18)) order by `test`.`t1`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -1364,7 +1364,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1411,7 +1411,7 @@ EXPLAIN EXTENDED DELETE   FROM t2 WHERE
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1674,8 +1674,8 @@ EXPLAIN EXTENDED UPDATE t2 SET a = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1684,10 +1684,10 @@ EXPLAIN EXTENDED SELECT * FROM t2     WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	i	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
-Warning	1713	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
+Warning	1736	Cannot use range access on index 'i' due to type or collation conversion on field 'i'
 Note	1003	/* select#1 */ select `test`.`t2`.`a` AS `a`,`test`.`t2`.`i` AS `i` from `test`.`t2` where ((`test`.`t2`.`i` > 10) and (`test`.`t2`.`i` <= 18)) order by `test`.`t2`.`i` limit 5
 # Status of EXPLAIN EXTENDED "equivalent" SELECT query execution
 Variable_name	Value
@@ -1812,7 +1812,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;
@@ -1858,7 +1858,7 @@ EXPLAIN EXTENDED UPDATE t2 SET d = 10 WH
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t2	ALL	a	NULL	NULL	NULL	26	100.00	Using where; Using filesort
 Warnings:
-Warning	1713	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
+Warning	1736	Cannot use range access on index 'a' due to type or collation conversion on field 'b'
 # Status of EXPLAIN EXTENDED query
 Variable_name	Value
 FLUSH STATUS;

=== modified file 'mysql-test/r/packet.result'
--- a/mysql-test/r/packet.result	2011-10-13 14:01:50 +0000
+++ b/mysql-test/r/packet.result	2012-03-15 09:55:15 +0000
@@ -3,7 +3,7 @@ set @net_buffer_length=@@global.net_buff
 set global max_allowed_packet=100;
 Warnings:
 Warning	1292	Truncated incorrect max_allowed_packet value: '100'
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 set global net_buffer_length=100;
 Warnings:
 Warning	1292	Truncated incorrect net_buffer_length value: '100'

=== modified file 'mysql-test/r/partition_exchange.result'
--- a/mysql-test/r/partition_exchange.result	2010-12-14 20:03:21 +0000
+++ b/mysql-test/r/partition_exchange.result	2012-03-15 09:55:15 +0000
@@ -533,8 +533,8 @@ ALTER TABLE tp EXCHANGE PARTITION p0 WIT
 ERROR HY000: Non matching attribute 'MAX_ROWS' between partition and table
 SHOW WARNINGS;
 Level	Code	Message
-Error	1705	Non matching attribute 'MAX_ROWS' between partition and table
-Error	1705	Non matching attribute 'MIN_ROWS' between partition and table
+Error	1728	Non matching attribute 'MAX_ROWS' between partition and table
+Error	1728	Non matching attribute 'MIN_ROWS' between partition and table
 DROP TABLE t;
 RENAME TABLE tmp2 TO t;
 ALTER TABLE t ADD KEY ba_key (b, a);

=== modified file 'mysql-test/r/read_only_innodb.result'
--- a/mysql-test/r/read_only_innodb.result	2011-10-13 14:01:50 +0000
+++ b/mysql-test/r/read_only_innodb.result	2012-03-15 09:55:15 +0000
@@ -97,7 +97,7 @@ a
 2
 ROLLBACK;
 Warnings:
-Warning	1733	The creation of some temporary tables could not be rolled back.
+Warning	1748	The creation of some temporary tables could not be rolled back.
 SELECT * FROM temp;
 a
 DROP TABLE temp;

=== modified file 'mysql-test/r/shm.result'
--- a/mysql-test/r/shm.result	2012-02-29 11:17:52 +0000
+++ b/mysql-test/r/shm.result	2012-03-15 09:55:15 +0000
@@ -2156,7 +2156,7 @@ SET @max_allowed_packet= @@global.max_al
 SET @net_buffer_length= @@global.net_buffer_length;
 SET GLOBAL max_allowed_packet= 1024;
 Warnings:
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SET GLOBAL net_buffer_length= 1024;
 ERROR 1153 (08S01) at line 1: Got a packet bigger than 'max_allowed_packet' bytes
 SET GLOBAL max_allowed_packet= @max_allowed_packet;

=== modified file 'mysql-test/r/sp-destruct.result'
--- a/mysql-test/r/sp-destruct.result	2011-03-30 13:33:29 +0000
+++ b/mysql-test/r/sp-destruct.result	2012-03-15 09:55:15 +0000
@@ -148,7 +148,7 @@ alter table mysql.proc drop column type;
 # The below statement should not cause assertion failure.
 drop database mysqltest;
 Warnings:
-Error	1701	Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted
+Error	1724	Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted
 # Restore mysql.proc.
 drop table mysql.proc;
 #
@@ -165,7 +165,7 @@ CREATE PROCEDURE db1.p1() SET @foo = 10;
 ALTER TABLE mysql.proc MODIFY comment CHAR (32);
 DROP DATABASE db1;
 Warnings:
-Error	1702	Cannot load from mysql.proc. The table is probably corrupted
+Error	1725	Cannot load from mysql.proc. The table is probably corrupted
 # Restore mysql.proc
 DROP TABLE mysql.proc;
 RENAME TABLE proc_backup TO mysql.proc;

=== modified file 'mysql-test/r/type_time.result'
--- a/mysql-test/r/type_time.result	2012-03-14 13:10:55 +0000
+++ b/mysql-test/r/type_time.result	2012-03-15 09:55:15 +0000
@@ -534,7 +534,7 @@ id	select_type	table	type	possible_keys
 1	SIMPLE	t1	index	col_time_key	col_time_key	4	NULL	5	100.00	Using index
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where; Using join buffer (Block Nested Loop)
 Warnings:
-Warning	1713	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
+Warning	1736	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
 Note	1003	/* select#1 */ select `test`.`t1`.`col_time_key` AS `col_time_key`,`test`.`t2`.`col_datetime_key` AS `col_datetime_key` from `test`.`t1` FORCE INDEX (`col_time_key`) straight_join `test`.`t2` IGNORE INDEX (`col_datetime_key`) where (`test`.`t1`.`col_time_key` = `test`.`t2`.`col_datetime_key`)
 SELECT * FROM
 t1 force INDEX (col_time_key)
@@ -556,7 +556,7 @@ id	select_type	table	type	possible_keys
 1	SIMPLE	t1	index	col_time_key	col_time_key	4	NULL	5	100.00	Using index
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	5	100.00	Using where; Using join buffer (Block Nested Loop)
 Warnings:
-Warning	1713	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
+Warning	1736	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
 Note	1003	/* select#1 */ select `test`.`t1`.`col_time_key` AS `col_time_key`,`test`.`t2`.`col_datetime_key` AS `col_datetime_key` from `test`.`t1` FORCE INDEX (`col_time_key`) straight_join `test`.`t2` IGNORE INDEX (`col_datetime_key`) where (`test`.`t2`.`col_datetime_key` = `test`.`t1`.`col_time_key`)
 SELECT * FROM
 t1 force INDEX (col_time_key)
@@ -578,7 +578,7 @@ id	select_type	table	type	possible_keys
 1	SIMPLE	t1	index	col_time_key	col_time_key	4	NULL	5	100.00	Using where; Using index
 1	SIMPLE	t2	ref	col_datetime_key	col_datetime_key	6	test.t1.col_time_key	1	100.00	Using where; Using index
 Warnings:
-Warning	1713	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
+Warning	1736	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
 Note	1003	/* select#1 */ select `test`.`t1`.`col_time_key` AS `col_time_key`,`test`.`t2`.`col_datetime_key` AS `col_datetime_key` from `test`.`t1` FORCE INDEX (`col_time_key`) straight_join `test`.`t2` FORCE INDEX (`col_datetime_key`) where (`test`.`t1`.`col_time_key` = `test`.`t2`.`col_datetime_key`)
 SELECT * FROM
 t1 force INDEX (col_time_key)
@@ -600,7 +600,7 @@ id	select_type	table	type	possible_keys
 1	SIMPLE	t1	index	col_time_key	col_time_key	4	NULL	5	100.00	Using where; Using index
 1	SIMPLE	t2	ref	col_datetime_key	col_datetime_key	6	test.t1.col_time_key	1	100.00	Using where; Using index
 Warnings:
-Warning	1713	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
+Warning	1736	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
 Note	1003	/* select#1 */ select `test`.`t1`.`col_time_key` AS `col_time_key`,`test`.`t2`.`col_datetime_key` AS `col_datetime_key` from `test`.`t1` FORCE INDEX (`col_time_key`) straight_join `test`.`t2` FORCE INDEX (`col_datetime_key`) where (`test`.`t2`.`col_datetime_key` = `test`.`t1`.`col_time_key`)
 SELECT * FROM
 t1 force INDEX (col_time_key)
@@ -664,7 +664,7 @@ id	select_type	table	type	possible_keys
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t1	ALL	col_time_key	NULL	NULL	NULL	5	100.00	Range checked for each record (index map: 0x1)
 Warnings:
-Warning	1713	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
+Warning	1736	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
 Note	1003	/* select#1 */ select `test`.`t2`.`col_datetime_key` AS `col_datetime_key`,`test`.`t1`.`col_time_key` AS `col_time_key` from `test`.`t2` IGNORE INDEX (`col_datetime_key`) straight_join `test`.`t1` FORCE INDEX (`col_time_key`) where (`test`.`t1`.`col_time_key` = `test`.`t2`.`col_datetime_key`)
 SELECT * FROM
 t2 ignore INDEX (col_datetime_key)
@@ -686,7 +686,7 @@ id	select_type	table	type	possible_keys
 1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	5	100.00	NULL
 1	SIMPLE	t1	ALL	col_time_key	NULL	NULL	NULL	5	100.00	Range checked for each record (index map: 0x1)
 Warnings:
-Warning	1713	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
+Warning	1736	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
 Note	1003	/* select#1 */ select `test`.`t2`.`col_datetime_key` AS `col_datetime_key`,`test`.`t1`.`col_time_key` AS `col_time_key` from `test`.`t2` IGNORE INDEX (`col_datetime_key`) straight_join `test`.`t1` FORCE INDEX (`col_time_key`) where (`test`.`t2`.`col_datetime_key` = `test`.`t1`.`col_time_key`)
 SELECT * FROM
 t2 ignore INDEX (col_datetime_key)
@@ -750,7 +750,7 @@ id	select_type	table	type	possible_keys
 1	SIMPLE	t2	index	col_datetime_key	col_datetime_key	6	NULL	5	100.00	Using index
 1	SIMPLE	t1	ALL	col_time_key	NULL	NULL	NULL	5	100.00	Range checked for each record (index map: 0x1)
 Warnings:
-Warning	1713	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
+Warning	1736	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
 Note	1003	/* select#1 */ select `test`.`t2`.`col_datetime_key` AS `col_datetime_key`,`test`.`t1`.`col_time_key` AS `col_time_key` from `test`.`t2` FORCE INDEX (`col_datetime_key`) straight_join `test`.`t1` FORCE INDEX (`col_time_key`) where (`test`.`t1`.`col_time_key` = `test`.`t2`.`col_datetime_key`)
 SELECT * FROM
 t2 force INDEX (col_datetime_key)
@@ -772,7 +772,7 @@ id	select_type	table	type	possible_keys
 1	SIMPLE	t2	index	col_datetime_key	col_datetime_key	6	NULL	5	100.00	Using index
 1	SIMPLE	t1	ALL	col_time_key	NULL	NULL	NULL	5	100.00	Range checked for each record (index map: 0x1)
 Warnings:
-Warning	1713	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
+Warning	1736	Cannot use ref access on index 'col_time_key' due to type or collation conversion on field 'col_time_key'
 Note	1003	/* select#1 */ select `test`.`t2`.`col_datetime_key` AS `col_datetime_key`,`test`.`t1`.`col_time_key` AS `col_time_key` from `test`.`t2` FORCE INDEX (`col_datetime_key`) straight_join `test`.`t1` FORCE INDEX (`col_time_key`) where (`test`.`t2`.`col_datetime_key` = `test`.`t1`.`col_time_key`)
 SELECT * FROM
 t2 force INDEX (col_datetime_key)

=== modified file 'mysql-test/r/variables-notembedded.result'
--- a/mysql-test/r/variables-notembedded.result	2011-10-13 14:01:50 +0000
+++ b/mysql-test/r/variables-notembedded.result	2012-03-15 09:55:15 +0000
@@ -154,10 +154,10 @@ ERROR HY000: Variable 'slave_skip_errors
 CREATE TABLE t1 (a MEDIUMTEXT);
 SET GLOBAL max_allowed_packet=2048;
 Warnings:
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SET GLOBAL net_buffer_length=4096;
 Warnings:
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SHOW SESSION VARIABLES LIKE 'max_allowed_packet';
 Variable_name	Value
 max_allowed_packet	2048

=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result	2011-11-10 06:53:27 +0000
+++ b/mysql-test/r/variables.result	2012-03-15 09:55:15 +0000
@@ -504,7 +504,7 @@ set low_priority_updates=1;
 set global max_allowed_packet=100;
 Warnings:
 Warning	1292	Truncated incorrect max_allowed_packet value: '100'
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 set global max_binlog_cache_size=100;
 Warnings:
 Warning	1292	Truncated incorrect max_binlog_cache_size value: '100'
@@ -1055,7 +1055,7 @@ set global myisam_data_pointer_size  =@m
 set global myisam_max_sort_file_size =@my_myisam_max_sort_file_size;
 set global net_buffer_length         =@my_net_buffer_length;
 Warnings:
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 set global net_write_timeout         =@my_net_write_timeout;
 set global net_read_timeout          =@my_net_read_timeout;
 set global query_cache_limit         =@my_query_cache_limit;
@@ -1526,7 +1526,7 @@ SET SQL_MODE=DEFAULT;
 SET @@global.max_binlog_cache_size=-1;
 Warnings:
 Warning	1292	Truncated incorrect max_binlog_cache_size value: '-1'
-Warning	1712	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SET @@global.max_join_size=0;
 Warnings:
 Warning	1292	Truncated incorrect max_join_size value: '0'

=== modified file 'mysql-test/suite/innodb/r/innodb_16k.result'
--- a/mysql-test/suite/innodb/r/innodb_16k.result	2012-03-14 15:41:23 +0000
+++ b/mysql-test/suite/innodb/r/innodb_16k.result	2012-03-15 09:55:15 +0000
@@ -610,7 +610,7 @@ UPDATE bug12547647 SET c = REPEAT('b',16
 ERROR HY000: Undo log record is too big.
 SHOW WARNINGS;
 Level	Code	Message
-Error	1743	Undo log record is too big.
+Error	1713	Undo log record is too big.
 DROP TABLE bug12547647;
 SET SESSION innodb_strict_mode = off;
 CREATE TABLE t1(

=== modified file 'mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result'
--- a/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result	2012-02-27 07:12:58 +0000
+++ b/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result	2012-03-15 09:55:15 +0000
@@ -584,7 +584,7 @@ WHERE col_1_varbinary = REPEAT("a", 4000
 ERROR HY000: Undo log record is too big.
 SHOW WARNINGS;
 Level	Code	Message
-Error	1743	Undo log record is too big.
+Error	1713	Undo log record is too big.
 DROP TABLE worklog5743;
 CREATE TABLE worklog5743 (
 col_1_varbinary VARBINARY (4000) , col_2_varchar VARCHAR (4000) ,
@@ -628,7 +628,7 @@ AND col_2_varchar = REPEAT("o", 4000);
 ERROR HY000: Undo log record is too big.
 SHOW WARNINGS;
 Level	Code	Message
-Error	1743	Undo log record is too big.
+Error	1713	Undo log record is too big.
 SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
 WHERE col_1_varbinary = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
 col_1_varbinary = REPEAT("c", 4000)

=== modified file 'mysql-test/suite/rpl/r/rpl_alter_repository.result'
--- a/mysql-test/suite/rpl/r/rpl_alter_repository.result	2012-03-14 15:41:23 +0000
+++ b/mysql-test/suite/rpl/r/rpl_alter_repository.result	2012-03-15 09:55:15 +0000
@@ -46,7 +46,7 @@ call mtr.add_suppression(" Error while c
 INSERT INTO t_innodb VALUES (1), (2), (3);
 ALTER TABLE mysql.slave_relay_log_info DROP COLUMN Sql_delay;
 INSERT INTO t_innodb VALUES (1), (2), (3);
-include/wait_for_slave_sql_error.inc [errno=1701]
+include/wait_for_slave_sql_error.inc [errno=1724]
 Last_SQL_Error = 'Column count of mysql.slave_relay_log_info is wrong. Expected 8, found 7. The table is probably corrupted'
 include/stop_slave_io.inc
 include/rpl_restart_server.inc [server_number=2 parameters: --relay-log-info-repository=FILE --skip-slave-start]
@@ -56,7 +56,7 @@ include/start_slave.inc
 INSERT INTO t_innodb VALUES (1), (2), (3);
 ALTER TABLE mysql.slave_relay_log_info DROP COLUMN Sql_delay;
 INSERT INTO t_innodb VALUES (1), (2), (3);
-include/wait_for_slave_sql_error.inc [errno=1701]
+include/wait_for_slave_sql_error.inc [errno=1724]
 Last_SQL_Error = 'Column count of mysql.slave_relay_log_info is wrong. Expected 8, found 7. The table is probably corrupted'
 include/stop_slave_io.inc
 START SLAVE SQL_THREAD;

=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2012-03-15 09:55:15 +0000
@@ -19,7 +19,7 @@ Variable_name	Slave_heartbeat_period
 Value	5.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.0009999;
 Warnings:
-Warning	1716	The requested value for the heartbeat period is less than 1 millisecond. The value is reset to 0, meaning that heartbeating will effectively be disabled.
+Warning	1703	The requested value for the heartbeat period is less than 1 millisecond. The value is reset to 0, meaning that heartbeating will effectively be disabled.
 Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 show status like 'Slave_heartbeat_period';;
@@ -27,7 +27,7 @@ Variable_name	Slave_heartbeat_period
 Value	0.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4294967;
 Warnings:
-Warning	1717	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
+Warning	1704	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
 Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 show status like 'Slave_heartbeat_period';;
@@ -44,7 +44,7 @@ reset slave;
 set @@global.slave_net_timeout= 5;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 5.001;
 Warnings:
-Warning	1717	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
+Warning	1704	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
 Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 show status like 'Slave_heartbeat_period';;
@@ -61,7 +61,7 @@ Variable_name	Slave_heartbeat_period
 Value	4.000
 set @@global.slave_net_timeout= 3 /* must be a warning */;
 Warnings:
-Warning	1717	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
+Warning	1704	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
 reset slave;
 drop table if exists t1;
 set @@global.slave_net_timeout= 10;

=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat_basic.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result	2012-01-27 08:04:47 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result	2012-03-15 09:55:15 +0000
@@ -52,7 +52,7 @@ RESET MASTER;
 *** Warning if updated slave_net_timeout < slave_heartbeat_timeout ***
 SET @@global.slave_net_timeout=FLOOR(SLAVE_HEARTBEAT_TIMEOUT)-1;
 Warnings:
-Warning	1717	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
+Warning	1704	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
 SET @@global.slave_net_timeout=@restore_slave_net_timeout;
 RESET SLAVE;
 RESET MASTER;
@@ -60,7 +60,7 @@ RESET MASTER;
 *** Warning if updated slave_heartbeat_timeout > slave_net_timeout ***
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=SLAVE_NET_TIMEOUT;
 Warnings:
-Warning	1717	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
+Warning	1704	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
 Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 RESET SLAVE;
@@ -181,7 +181,7 @@ RESET SLAVE;
 RESET MASTER;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.0009;
 Warnings:
-Warning	1716	The requested value for the heartbeat period is less than 1 millisecond. The value is reset to 0, meaning that heartbeating will effectively be disabled.
+Warning	1703	The requested value for the heartbeat period is less than 1 millisecond. The value is reset to 0, meaning that heartbeating will effectively be disabled.
 Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
@@ -193,7 +193,7 @@ RESET MASTER;
 *** Max slave_heartbeat_timeout ***
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=4294967;
 Warnings:
-Warning	1717	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
+Warning	1704	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout.
 Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
 Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result	2012-02-08 13:28:38 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result	2012-03-15 09:55:15 +0000
@@ -7,11 +7,11 @@ call mtr.add_suppression("Unsafe stateme
 call mtr.add_suppression("Option binlog_cache_size ");
 SET GLOBAL max_binlog_cache_size = 4096;
 Warnings:
-Warning	1712	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SET GLOBAL binlog_cache_size = 4096;
 SET GLOBAL max_binlog_stmt_cache_size = 4096;
 Warnings:
-Warning	1725	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
+Warning	1742	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
 SET GLOBAL binlog_stmt_cache_size = 4096;
 CREATE TABLE t1(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=Innodb;
 CREATE TABLE t2(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=MyIsam;
@@ -116,11 +116,11 @@ include/diff_tables.inc [master:t1,slave
 # [ On Slave ]
 SET GLOBAL max_binlog_cache_size = 4096;
 Warnings:
-Warning	1712	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SET GLOBAL binlog_cache_size = 4096;
 SET GLOBAL max_binlog_stmt_cache_size = 4096;
 Warnings:
-Warning	1725	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
+Warning	1742	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
 SET GLOBAL binlog_stmt_cache_size = 4096;
 include/stop_slave.inc
 include/start_slave.inc
@@ -154,7 +154,7 @@ count(*)
 ######## CHECK MAX_BINLOG_CACHE_SIZE and BINLOG_CACHE_SIZE #########
 SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 8192;
 Warnings:
-Warning	1712	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
 SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE';
 Variable_name	Value
 max_binlog_cache_size	8192
@@ -163,7 +163,7 @@ Variable_name	Value
 binlog_cache_size	8192
 SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384;
 Warnings:
-Warning	1712	Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
 SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE';
 Variable_name	Value
 max_binlog_cache_size	8192
@@ -172,7 +172,7 @@ Variable_name	Value
 binlog_cache_size	8192
 SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 4096;
 Warnings:
-Warning	1712	Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE';
 Variable_name	Value
 max_binlog_cache_size	4096

=== modified file 'mysql-test/suite/rpl/r/rpl_packet.result'
--- a/mysql-test/suite/rpl/r/rpl_packet.result	2012-03-06 14:29:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_packet.result	2012-03-15 09:55:15 +0000
@@ -77,7 +77,7 @@ WARNING: The range of printed events end
 DROP TABLE t1;
 SET @@global.max_allowed_packet= 1024;
 Warnings:
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SET @@global.net_buffer_length= 1024;
 SET @@global.max_allowed_packet= 1024;
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_start_stop.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result	2011-11-19 08:08:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result	2012-03-15 09:55:15 +0000
@@ -19,7 +19,7 @@ include/wait_for_slave_sql_to_stop.inc
 include/start_slave.inc
 select id from coord_proc_list into @c_id;
 kill query @c_id;
-include/wait_for_slave_sql_error.inc [errno=1742]
+include/wait_for_slave_sql_error.inc [errno=1753]
 include/start_slave.inc
 CREATE TABLE t1 (a int primary key) engine=innodb;
 insert into t1 values (1),(2);
@@ -62,17 +62,17 @@ set @save.slave_transaction_retries= @@g
 set @@global.slave_transaction_retries= 1;
 start slave sql_thread;
 Warnings:
-Note	1739	slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop.
+Note	1750	slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop.
 include/stop_slave.inc
 create table t2 (a int);
 insert into t2 values (1);
 start slave until master_log_file='master-bin.000001', master_log_pos=MASTER_LOG_POS;
 Warnings:
-Note	1739	UNTIL condtion is not supported in multi-threaded slave mode. Slave is started in the sequential execution mode.
+Note	1750	UNTIL condtion is not supported in multi-threaded slave mode. Slave is started in the sequential execution mode.
 include/wait_for_slave_sql_to_stop.inc
 include/start_slave.inc
 Warnings:
-Note	1739	slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop.
+Note	1750	slave_transaction_retries is not supported in multi-threaded slave mode. In the event of a transient failure, the slave will not retry the transaction and will stop.
 drop table t1;
 drop table t2m;
 drop table t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result	2012-02-08 13:28:38 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result	2012-03-15 09:55:15 +0000
@@ -7,11 +7,11 @@ call mtr.add_suppression("Unsafe stateme
 call mtr.add_suppression("Option binlog_cache_size ");
 SET GLOBAL max_binlog_cache_size = 4096;
 Warnings:
-Warning	1712	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SET GLOBAL binlog_cache_size = 4096;
 SET GLOBAL max_binlog_stmt_cache_size = 4096;
 Warnings:
-Warning	1725	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
+Warning	1742	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
 SET GLOBAL binlog_stmt_cache_size = 4096;
 CREATE TABLE t1(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=Innodb;
 CREATE TABLE t2(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=MyIsam;
@@ -117,11 +117,11 @@ include/diff_tables.inc [master:t1,slave
 # [ On Slave ]
 SET GLOBAL max_binlog_cache_size = 4096;
 Warnings:
-Warning	1712	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SET GLOBAL binlog_cache_size = 4096;
 SET GLOBAL max_binlog_stmt_cache_size = 4096;
 Warnings:
-Warning	1725	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
+Warning	1742	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
 SET GLOBAL binlog_stmt_cache_size = 4096;
 include/stop_slave.inc
 include/start_slave.inc
@@ -155,7 +155,7 @@ count(*)
 ######## CHECK MAX_BINLOG_CACHE_SIZE and BINLOG_CACHE_SIZE #########
 SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 8192;
 Warnings:
-Warning	1712	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
 SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE';
 Variable_name	Value
 max_binlog_cache_size	8192
@@ -164,7 +164,7 @@ Variable_name	Value
 binlog_cache_size	8192
 SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384;
 Warnings:
-Warning	1712	Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
 SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE';
 Variable_name	Value
 max_binlog_cache_size	8192
@@ -173,7 +173,7 @@ Variable_name	Value
 binlog_cache_size	8192
 SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 4096;
 Warnings:
-Warning	1712	Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE';
 Variable_name	Value
 max_binlog_cache_size	4096

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result	2012-02-08 13:28:38 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result	2012-03-15 09:55:15 +0000
@@ -7,11 +7,11 @@ call mtr.add_suppression("Unsafe stateme
 call mtr.add_suppression("Option binlog_cache_size ");
 SET GLOBAL max_binlog_cache_size = 4096;
 Warnings:
-Warning	1712	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SET GLOBAL binlog_cache_size = 4096;
 SET GLOBAL max_binlog_stmt_cache_size = 4096;
 Warnings:
-Warning	1725	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
+Warning	1742	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
 SET GLOBAL binlog_stmt_cache_size = 4096;
 CREATE TABLE t1(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=Innodb;
 CREATE TABLE t2(a INT PRIMARY KEY, data VARCHAR(30000)) ENGINE=MyIsam;
@@ -116,11 +116,11 @@ include/diff_tables.inc [master:t1,slave
 # [ On Slave ]
 SET GLOBAL max_binlog_cache_size = 4096;
 Warnings:
-Warning	1712	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SET GLOBAL binlog_cache_size = 4096;
 SET GLOBAL max_binlog_stmt_cache_size = 4096;
 Warnings:
-Warning	1725	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
+Warning	1742	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
 SET GLOBAL binlog_stmt_cache_size = 4096;
 include/stop_slave.inc
 include/start_slave.inc
@@ -154,7 +154,7 @@ count(*)
 ######## CHECK MAX_BINLOG_CACHE_SIZE and BINLOG_CACHE_SIZE #########
 SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 8192;
 Warnings:
-Warning	1712	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
 SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE';
 Variable_name	Value
 max_binlog_cache_size	8192
@@ -163,7 +163,7 @@ Variable_name	Value
 binlog_cache_size	8192
 SET @@GLOBAL.BINLOG_CACHE_SIZE= 16384;
 Warnings:
-Warning	1712	Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (16384) is greater than max_binlog_cache_size (8192); setting binlog_cache_size equal to max_binlog_cache_size.
 SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE';
 Variable_name	Value
 max_binlog_cache_size	8192
@@ -172,7 +172,7 @@ Variable_name	Value
 binlog_cache_size	8192
 SET @@GLOBAL.MAX_BINLOG_CACHE_SIZE= 4096;
 Warnings:
-Warning	1712	Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (8192) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SHOW VARIABLES LIKE 'MAX_BINLOG_CACHE_SIZE';
 Variable_name	Value
 max_binlog_cache_size	4096

=== modified file 'mysql-test/suite/rpl/t/rpl_alter_repository.test'
--- a/mysql-test/suite/rpl/t/rpl_alter_repository.test	2011-10-27 13:28:31 +0000
+++ b/mysql-test/suite/rpl/t/rpl_alter_repository.test	2012-03-15 09:55:15 +0000
@@ -57,7 +57,7 @@ ALTER TABLE mysql.slave_relay_log_info D
 --connection master
 INSERT INTO t_innodb VALUES (1), (2), (3);
 --connection slave
---let $slave_sql_errno= 1701
+--let $slave_sql_errno= 1724
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error.inc
 --source include/stop_slave_io.inc
@@ -93,7 +93,7 @@ ALTER TABLE mysql.slave_relay_log_info D
 --connection master
 INSERT INTO t_innodb VALUES (1), (2), (3);
 --connection slave
---let $slave_sql_errno= 1701
+--let $slave_sql_errno= 1724
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error.inc
 --source include/stop_slave_io.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_start_stop.test'
--- a/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test	2012-01-11 07:29:43 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_start_stop.test	2012-03-15 09:55:15 +0000
@@ -68,7 +68,7 @@ let $count= 0;
 let $table= worker_proc_list;
 source include/wait_until_rows_count.inc;
 
-let $slave_sql_errno= 1742; # ER_MTS_PARALLEL_INCONSISTENT_DATA
+let $slave_sql_errno= 1753; # ER_MTS_PARALLEL_INCONSISTENT_DATA
 source include/wait_for_slave_sql_error.inc;
 
 source include/start_slave.inc;

=== modified file 'mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result'
--- a/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result	2011-10-13 14:01:50 +0000
+++ b/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result	2012-03-15 09:55:15 +0000
@@ -7,7 +7,7 @@ SET @@global.max_allowed_packet = DEFAUL
 SET @@global.max_allowed_packet = 1000;
 Warnings:
 Warning	1292	Truncated incorrect max_allowed_packet value: '1000'
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SET @@global.max_allowed_packet = DEFAULT;
 SELECT @@global.max_allowed_packet;
 @@global.max_allowed_packet
@@ -27,14 +27,14 @@ SELECT @@global.max_allowed_packet = 104
 '#--------------------FN_DYNVARS_070_03-------------------------#'
 SET @@global.max_allowed_packet = 1024;
 Warnings:
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SELECT @@global.max_allowed_packet;
 @@global.max_allowed_packet
 1024
 SET @@global.max_allowed_packet = 1025;
 Warnings:
 Warning	1292	Truncated incorrect max_allowed_packet value: '1025'
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SELECT @@global.max_allowed_packet;
 @@global.max_allowed_packet
 1024
@@ -78,21 +78,21 @@ SELECT @@session.max_allowed_packet;
 SET @@global.max_allowed_packet = 0;
 Warnings:
 Warning	1292	Truncated incorrect max_allowed_packet value: '0'
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SELECT @@global.max_allowed_packet;
 @@global.max_allowed_packet
 1024
 SET @@global.max_allowed_packet = -1024;
 Warnings:
 Warning	1292	Truncated incorrect max_allowed_packet value: '-1024'
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SELECT @@global.max_allowed_packet;
 @@global.max_allowed_packet
 1024
 SET @@global.max_allowed_packet = 1023;
 Warnings:
 Warning	1292	Truncated incorrect max_allowed_packet value: '1023'
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SELECT @@global.max_allowed_packet;
 @@global.max_allowed_packet
 1024
@@ -155,21 +155,21 @@ WHERE VARIABLE_NAME='max_allowed_packet'
 SET @@global.max_allowed_packet = TRUE;
 Warnings:
 Warning	1292	Truncated incorrect max_allowed_packet value: '1'
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SELECT @@global.max_allowed_packet;
 @@global.max_allowed_packet
 1024
 SET @@global.max_allowed_packet = FALSE;
 Warnings:
 Warning	1292	Truncated incorrect max_allowed_packet value: '0'
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SELECT @@global.max_allowed_packet;
 @@global.max_allowed_packet
 1024
 '#---------------------FN_DYNVARS_070_09----------------------#'
 SET @@global.max_allowed_packet = 2048;
 Warnings:
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SELECT @@max_allowed_packet = @@global.max_allowed_packet;
 @@max_allowed_packet = @@global.max_allowed_packet
 0

=== modified file 'mysql-test/suite/sys_vars/r/max_allowed_packet_func.result'
--- a/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result	2011-10-13 14:01:50 +0000
+++ b/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result	2012-03-15 09:55:15 +0000
@@ -24,7 +24,7 @@ SELECT @@session.net_buffer_length;
 ## Setting value of max_allowed packet and net_buffer_length to 1024 ##
 SET @@global.max_allowed_packet = 1024;
 Warnings:
-Warning	1731	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
+Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 SET @@global.net_buffer_length = 1024;
 SELECT @@global.max_allowed_packet;
 @@global.max_allowed_packet

=== modified file 'mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result	2010-11-16 12:14:06 +0000
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result	2012-03-15 09:55:15 +0000
@@ -10,7 +10,7 @@ SELECT @start_binlog_cache_size;
 SET @@global.max_binlog_cache_size = 5000;
 Warnings:
 Warning	1292	Truncated incorrect max_binlog_cache_size value: '5000'
-Warning	1712	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
+Warning	1735	Option binlog_cache_size (32768) is greater than max_binlog_cache_size (4096); setting binlog_cache_size equal to max_binlog_cache_size.
 SET @@global.max_binlog_cache_size = DEFAULT;
 SELECT @@global.max_binlog_cache_size;
 @@global.max_binlog_cache_size

=== modified file 'mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result	2011-10-13 14:01:50 +0000
+++ b/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result	2012-03-15 09:55:15 +0000
@@ -10,7 +10,7 @@ SELECT @start_binlog_stmt_cache_size;
 SET @@global.max_binlog_stmt_cache_size = 5000;
 Warnings:
 Warning	1292	Truncated incorrect max_binlog_stmt_cache_size value: '5000'
-Warning	1725	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
+Warning	1742	Option binlog_stmt_cache_size (32768) is greater than max_binlog_stmt_cache_size (4096); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size.
 SET @@global.max_binlog_stmt_cache_size = DEFAULT;
 SELECT @@global.max_binlog_stmt_cache_size;
 @@global.max_binlog_stmt_cache_size

=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2012-03-15 09:17:57 +0000
+++ b/sql/share/errmsg-utf8.txt	2012-03-15 09:55:15 +0000
@@ -6425,6 +6425,82 @@ ER_SET_PASSWORD_AUTH_PLUGIN
 ER_GRANT_PLUGIN_USER_EXISTS
         eng "GRANT with IDENTIFIED WITH is illegal because the user %-.*s already exists"
 
+ER_TRUNCATE_ILLEGAL_FK 42000
+  eng "Cannot truncate a table referenced in a foreign key constraint (%.192s)"
+
+ER_PLUGIN_IS_PERMANENT
+  eng "Plugin '%s' is force_plus_permanent and can not be unloaded"
+
+ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN
+  eng "The requested value for the heartbeat period is less than 1 millisecond. The value is reset to 0, meaning that heartbeating will effectively be disabled."
+
+ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX
+  eng "The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout."
+
+ER_STMT_CACHE_FULL  
+        eng "Multi-row statements required more than 'max_binlog_stmt_cache_size' bytes of storage; increase this mysqld variable and try again"
+
+ER_MULTI_UPDATE_KEY_CONFLICT
+  eng "Primary key/partition key update is not allowed since the table is updated both as '%-.192s' and '%-.192s'."
+
+# When translating this error message make sure to include "ALTER TABLE" in the
+# message as mysqlcheck parses the error message looking for ALTER TABLE.
+ER_TABLE_NEEDS_REBUILD
+        eng "Table rebuild required. Please do \"ALTER TABLE `%-.32s` FORCE\" or dump/reload to fix it!"
+
+WARN_OPTION_BELOW_LIMIT
+  eng "The value of '%s' should be no less than the value of '%s'"
+
+ER_INDEX_COLUMN_TOO_LONG
+  eng "Index column size too large. The maximum column size is %lu bytes."
+
+ER_ERROR_IN_TRIGGER_BODY
+  eng "Trigger '%-.64s' has an error in its body: '%-.256s'"
+
+ER_ERROR_IN_UNKNOWN_TRIGGER_BODY
+  eng "Unknown trigger has an error in its body: '%-.256s'"
+
+ER_INDEX_CORRUPT
+  eng "Index %s is corrupted"
+
+ER_UNDO_RECORD_TOO_BIG
+  eng "Undo log record is too big."
+
+ER_BINLOG_UNSAFE_INSERT_IGNORE_SELECT
+  eng "INSERT IGNORE... SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are ignored. This order cannot be predicted and may differ on master and the slave."
+
+ER_BINLOG_UNSAFE_INSERT_SELECT_UPDATE
+  eng "INSERT... SELECT... ON DUPLICATE KEY UPDATE is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are updated. This order cannot be predicted and may differ on master and the slave."
+
+ER_BINLOG_UNSAFE_REPLACE_SELECT
+ eng "REPLACE... SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave."
+
+ER_BINLOG_UNSAFE_CREATE_IGNORE_SELECT
+  eng "CREATE... IGNORE SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are ignored. This order cannot be predicted and may differ on master and the slave."
+
+ER_BINLOG_UNSAFE_CREATE_REPLACE_SELECT
+  eng "CREATE... REPLACE SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave."
+
+ER_BINLOG_UNSAFE_UPDATE_IGNORE
+  eng "UPDATE IGNORE is unsafe because the order in which rows are updated determines which (if any) rows are ignored. This order cannot be predicted and may differ on master and the slave."
+
+ER_PLUGIN_NO_UNINSTALL
+  eng "Plugin '%s' is marked as not dynamically uninstallable. You have to stop the server to uninstall it."
+
+ER_PLUGIN_NO_INSTALL
+  eng "Plugin '%s' is marked as not dynamically installable. You have to stop the server to install it."
+
+
+ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT
+  eng "Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave."
+
+ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC
+  eng "CREATE TABLE... SELECT...  on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are inserted. This order cannot be predicted and may differ on master and the slave."
+
+#
+#  End of 5.5 error messages.
+#
+
 ER_COL_COUNT_DOESNT_MATCH_CORRUPTED_V2
   eng "Column count of %s.%s is wrong. Expected %d, found %d. The table is probably corrupted"
   ger "Spaltenanzahl von %s.%s falsch. %d erwartet, aber %d gefunden. Tabelle ist wahrscheinlich beschädigt"
@@ -6464,17 +6540,6 @@ ER_BINLOG_CACHE_SIZE_GREATER_THAN_MAX
   eng "Option binlog_cache_size (%lu) is greater than max_binlog_cache_size (%lu); setting binlog_cache_size equal to max_binlog_cache_size."
 ER_WARN_INDEX_NOT_APPLICABLE
   eng "Cannot use %-.64s access on index '%-.64s' due to type or collation conversion on field '%-.64s'"
-ER_TRUNCATE_ILLEGAL_FK 42000
-  eng "Cannot truncate a table referenced in a foreign key constraint (%.192s)"
-
-ER_PLUGIN_IS_PERMANENT
-  eng "Plugin '%s' is force_plus_permanent and can not be unloaded"
-
-ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN
-  eng "The requested value for the heartbeat period is less than 1 millisecond. The value is reset to 0, meaning that heartbeating will effectively be disabled."
-
-ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX
-  eng "The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout."
 
 ER_PARTITION_EXCHANGE_FOREIGN_KEY
   eng "Table to exchange with partition has foreign key references: '%-.64s'"
@@ -6488,12 +6553,6 @@ ER_NETWORK_READ_EVENT_CHECKSUM_FAILURE
 ER_BINLOG_READ_EVENT_CHECKSUM_FAILURE
   eng "Replication event checksum verification failed while reading from a log file."
 
-ER_STMT_CACHE_FULL  
-        eng "Multi-row statements required more than 'max_binlog_stmt_cache_size' bytes of storage; increase this mysqld variable and try again"
-
-ER_MULTI_UPDATE_KEY_CONFLICT
-  eng "Primary key/partition key update is not allowed since the table is updated both as '%-.192s' and '%-.192s'."
-
 ER_BINLOG_STMT_CACHE_SIZE_GREATER_THAN_MAX
   eng "Option binlog_stmt_cache_size (%lu) is greater than max_binlog_stmt_cache_size (%lu); setting binlog_stmt_cache_size equal to max_binlog_stmt_cache_size."
 ER_CANT_UPDATE_TABLE_IN_CREATE_TABLE_SELECT
@@ -6525,14 +6584,6 @@ ER_NO_SUCH_PARTITION
   spa "Particion '%-.64s' no existe"
   swe "Det finns ingen partition som heter '%-.64s'"
 
-# When translating this error message make sure to include "ALTER TABLE" in the
-# message as mysqlcheck parses the error message looking for ALTER TABLE.
-ER_TABLE_NEEDS_REBUILD
-        eng "Table rebuild required. Please do \"ALTER TABLE `%-.32s` FORCE\" or dump/reload to fix it!"
-
-WARN_OPTION_BELOW_LIMIT
-  eng "The value of '%s' should be no less than the value of '%s'"
-
 ER_CHANGE_RPL_INFO_REPOSITORY_FAILURE
   eng "Failure while changing the type of replication repository: %s."
 
@@ -6541,18 +6592,6 @@ ER_WARNING_NOT_COMPLETE_ROLLBACK_WITH_CR
 ER_WARNING_NOT_COMPLETE_ROLLBACK_WITH_DROPPED_TEMP_TABLE
   eng "Some temporary tables were dropped, but these operations could not be rolled back."
 
-ER_INDEX_COLUMN_TOO_LONG
-  eng "Index column size too large. The maximum column size is %lu bytes."
-
-ER_ERROR_IN_TRIGGER_BODY
-  eng "Trigger '%-.64s' has an error in its body: '%-.256s'"
-
-ER_ERROR_IN_UNKNOWN_TRIGGER_BODY
-  eng "Unknown trigger has an error in its body: '%-.256s'"
-
-ER_INDEX_CORRUPT
-  eng "Index %s is corrupted"
-
 ER_MTS_FEATURE_IS_NOT_SUPPORTED
   eng "%s is not supported in multi-threaded slave mode. %s"
 ER_MTS_UPDATED_DBS_GREATER_MAX
@@ -6562,33 +6601,6 @@ ER_MTS_CANT_PARALLEL
 ER_MTS_INCONSISTENT_DATA
   eng "%s"
 
-ER_UNDO_RECORD_TOO_BIG
-  eng "Undo log record is too big."
-
-ER_BINLOG_UNSAFE_INSERT_IGNORE_SELECT
-  eng "INSERT IGNORE... SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are ignored. This order cannot be predicted and may differ on master and the slave."
-
-ER_BINLOG_UNSAFE_INSERT_SELECT_UPDATE
-  eng "INSERT... SELECT... ON DUPLICATE KEY UPDATE is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are updated. This order cannot be predicted and may differ on master and the slave."
-
-ER_BINLOG_UNSAFE_REPLACE_SELECT
- eng "REPLACE... SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave."
-
-ER_BINLOG_UNSAFE_CREATE_IGNORE_SELECT
-  eng "CREATE... IGNORE SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are ignored. This order cannot be predicted and may differ on master and the slave."
-
-ER_BINLOG_UNSAFE_CREATE_REPLACE_SELECT
-  eng "CREATE... REPLACE SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave."
-
-ER_BINLOG_UNSAFE_UPDATE_IGNORE
-  eng "UPDATE IGNORE is unsafe because the order in which rows are updated determines which (if any) rows are ignored. This order cannot be predicted and may differ on master and the slave."
-
-ER_PLUGIN_NO_UNINSTALL
-  eng "Plugin '%s' is marked as not dynamically uninstallable. You have to stop the server to uninstall it."
-
-ER_PLUGIN_NO_INSTALL
-  eng "Plugin '%s' is marked as not dynamically installable. You have to stop the server to install it."
-
 ER_FULLTEXT_NOT_SUPPORTED_WITH_PARTITIONING
   eng "FULLTEXT index is not supported for partitioned tables."
   swe "FULLTEXT index stöds ej för partitionerade tabeller."
@@ -6597,6 +6609,12 @@ ER_DA_INVALID_CONDITION_NUMBER 35000
   eng "Invalid condition number"
   por "Número de condição inválido"
 
+ER_INSECURE_PLAIN_TEXT
+  eng "Sending passwords in plain text without SSL/TLS is extremely insecure."
+
+ER_INSECURE_CHANGE_MASTER
+  eng "Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives."
+
 ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO 23000 S1009
         eng "Foreign key constraint for table '%.192s', record '%-.192s' would lead to a duplicate entry in table '%.192s', key '%.192s'"
         ger "Fremdschlüssel-Beschränkung für Tabelle '%.192s', Datensatz '%-.192s' würde zu einem doppelten Eintrag in Tabelle '%.192s', Schlüssel '%.192s' führen"
@@ -6606,12 +6624,6 @@ ER_FOREIGN_DUPLICATE_KEY_WITHOUT_CHILD_I
         eng "Foreign key constraint for table '%.192s', record '%-.192s' would lead to a duplicate entry in a child table"
         ger "Fremdschlüssel-Beschränkung fdoppelten Eintrag in einer Kind-Tabelle führen"
         swe "FOREIGN KEY constraint för tabell '%.192s', posten '%-.192s' kan inte uppdatera en barntabell på grund av UNIQUE-test"
-ER_INSECURE_PLAIN_TEXT
-  eng "Sending passwords in plain text without SSL/TLS is extremely insecure."
-
-ER_INSECURE_CHANGE_MASTER
-  eng "Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives."
-
 ER_SQLTHREAD_WITH_SECURE_SLAVE
   eng "Setting authentication options is not possible when only the Slave SQL Thread is being started."
 
@@ -6624,12 +6636,6 @@ ER_INNODB_FT_LIMIT
 ER_INNODB_NO_FT_TEMP_TABLE
   eng "Cannot create FULLTEXT index on temporary InnoDB table"
 
-ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT
-  eng "Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave."
-
-ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC
-  eng "CREATE TABLE... SELECT...  on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are inserted. This order cannot be predicted and may differ on master and the slave."
-
 ER_VARIABLE_NOT_SETTABLE_IN_SF_OR_TRIGGER
   eng "The system variable %.200s cannot be set in stored functions or triggers."
 
@@ -6720,3 +6726,7 @@ ER_TOO_LONG_TABLE_PARTITION_COMMENT
 
 ER_SLAVE_CONFIGURATION
   eng "Slave is not configured or failed to initialize properly. You must at least set --server-id to enable either a master or a slave. Additional error messages can be found in the MySQL error log."
+
+#
+#  End of 5.6 error messages.
+#

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (jon.hauglid:3778 to 3779) Bug#13833438Jon Olav Hauglid15 Mar