diff options
Diffstat (limited to 'mysql-test/include/mix1.inc')
| -rw-r--r-- | mysql-test/include/mix1.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index 3c6628091ec..98323e44e97 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -649,24 +649,24 @@ drop table t1; CREATE TABLE t1 (a int, b int); insert into t1 values (1,1),(1,2); ---error ER_DUP_ENTRY_WITH_KEY_NAME +--error ER_DUP_ENTRY CREATE TABLE t2 (primary key (a)) select * from t1; # This should give warning drop table if exists t2; ---error ER_DUP_ENTRY_WITH_KEY_NAME +--error ER_DUP_ENTRY CREATE TEMPORARY TABLE t2 (primary key (a)) select * from t1; # This should give warning drop table if exists t2; CREATE TABLE t2 (a int, b int, primary key (a)); BEGIN; INSERT INTO t2 values(100,100); ---error ER_DUP_ENTRY_WITH_KEY_NAME +--error ER_DUP_ENTRY CREATE TABLE IF NOT EXISTS t2 (primary key (a)) select * from t1; SELECT * from t2; ROLLBACK; SELECT * from t2; TRUNCATE table t2; ---error ER_DUP_ENTRY_WITH_KEY_NAME +--error ER_DUP_ENTRY INSERT INTO t2 select * from t1; SELECT * from t2; drop table t2; @@ -674,19 +674,19 @@ drop table t2; CREATE TEMPORARY TABLE t2 (a int, b int, primary key (a)); BEGIN; INSERT INTO t2 values(100,100); ---error ER_DUP_ENTRY_WITH_KEY_NAME +--error ER_DUP_ENTRY CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) select * from t1; SELECT * from t2; COMMIT; BEGIN; INSERT INTO t2 values(101,101); ---error ER_DUP_ENTRY_WITH_KEY_NAME +--error ER_DUP_ENTRY CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) select * from t1; SELECT * from t2; ROLLBACK; SELECT * from t2; TRUNCATE table t2; ---error ER_DUP_ENTRY_WITH_KEY_NAME +--error ER_DUP_ENTRY INSERT INTO t2 select * from t1; SELECT * from t2; drop table t1,t2; |