From 6cc9f4ac5c1530087ae1b808ab0fdcc58b308b54 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 5 Nov 2013 20:30:36 +0200 Subject: Added usage of handler error names to mysqltest include/CMakeLists.txt: Added handler_ername.h include/handler_ername.h: Names of handler error messages mysql-test/extra/binlog_tests/binlog.test: Test using handler error names mysql-test/r/mysqltest.result: Update for new error message mysql-test/t/auto_increment.test: Test using handler error names mysql-test/t/auto_increment_ranges.inc: Test using handler error names mysql-test/t/replace.test: Test using handler error names --- mysql-test/t/auto_increment_ranges.inc | 56 +++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'mysql-test/t/auto_increment_ranges.inc') diff --git a/mysql-test/t/auto_increment_ranges.inc b/mysql-test/t/auto_increment_ranges.inc index a94aa46d38e..1540be0828e 100644 --- a/mysql-test/t/auto_increment_ranges.inc +++ b/mysql-test/t/auto_increment_ranges.inc @@ -13,25 +13,25 @@ let $range_max=32767; eval create table t1 (a $type primary key auto_increment); eval insert into t1 values($range_max); ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(NULL); truncate table t1; eval insert into t1 values($range_max-1); insert into t1 values(NULL); ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(NULL); select * from t1; truncate table t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values($range_max),(NULL); select * from t1; truncate table t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values($range_max-1),(NULL),(NULL); truncate table t1; eval insert into t1 values($range_max+1); select * from t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values(NULL); drop table t1; @@ -44,25 +44,25 @@ let $range_max=65535; eval create table t1 (a $type primary key auto_increment); eval insert into t1 values($range_max); ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(NULL); truncate table t1; eval insert into t1 values($range_max-1); insert into t1 values(NULL); ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(NULL); select * from t1; truncate table t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values($range_max),(NULL); select * from t1; truncate table t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values($range_max-1),(NULL),(NULL); truncate table t1; eval insert into t1 values($range_max+1); select * from t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values(NULL); drop table t1; @@ -75,25 +75,25 @@ let $range_max=2147483647; eval create table t1 (a $type primary key auto_increment); eval insert into t1 values($range_max); ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(NULL); truncate table t1; eval insert into t1 values($range_max-1); insert into t1 values(NULL); ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(NULL); select * from t1; truncate table t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values($range_max),(NULL); select * from t1; truncate table t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values($range_max-1),(NULL),(NULL); truncate table t1; eval insert into t1 values($range_max+1); select * from t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values(NULL); drop table t1; @@ -106,25 +106,25 @@ let $range_max=4294967295; eval create table t1 (a $type primary key auto_increment); eval insert into t1 values($range_max); ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(NULL); truncate table t1; eval insert into t1 values($range_max-1); insert into t1 values(NULL); ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(NULL); select * from t1; truncate table t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values($range_max),(NULL); select * from t1; truncate table t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values($range_max-1),(NULL),(NULL); truncate table t1; eval insert into t1 values($range_max+1); select * from t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values(NULL); drop table t1; @@ -137,25 +137,25 @@ let $range_max=cast(9223372036854775807 as unsigned); eval create table t1 (a $type primary key auto_increment); eval insert into t1 values($range_max); ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(NULL); truncate table t1; eval insert into t1 values($range_max-1); insert into t1 values(NULL); ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(NULL); select * from t1; truncate table t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values($range_max),(NULL); select * from t1; truncate table t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values($range_max-1),(NULL),(NULL); truncate table t1; eval insert into t1 values($range_max+1); select * from t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE eval insert into t1 values(NULL); drop table t1; @@ -200,7 +200,7 @@ set @org_mode=@@sql_mode; set @@sql_mode='ansi,traditional'; insert ignore into t1 values(32766),(NULL),(NULL); truncate table t1; ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(32766),(NULL),(NULL); set @@sql_mode=@org_mode; drop table t1; @@ -223,7 +223,7 @@ DROP TABLE t1; CREATE TABLE t1 (a smallint AUTO_INCREMENT, PRIMARY KEY (a)); INSERT INTO t1 VALUES (2); INSERT INTO t1 VALUES (32768); ---error 167 +--error HA_ERR_AUTOINC_ERANGE INSERT INTO t1 VALUES (NULL); SELECT * FROM t1; DROP TABLE t1; @@ -235,6 +235,6 @@ DROP TABLE t1; create table t1 (a smallint primary key auto_increment); insert into t1 values(32766),(NULL); delete from t1 where a=32767; ---error 167 +--error HA_ERR_AUTOINC_ERANGE insert into t1 values(NULL); drop table t1; -- cgit v1.2.1