diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:55:37 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:55:37 +0200 |
| commit | f2123f34e3c0b9315626406786293a5fafa2fc13 (patch) | |
| tree | 34705bdb0e8d518cdc7400d5d2afb11ae8cf2bab /mysql-test/include/mix1.inc | |
| parent | eb498cce4dafc2eda285c71ed96d64e451f02ec2 (diff) | |
| parent | d0d8bbed5e901e59044be6bcaa6d4020238a1eb4 (diff) | |
| download | mariadb-git-f2123f34e3c0b9315626406786293a5fafa2fc13.tar.gz | |
Merge from mysql-5.5-bugfixing to mysql-5.5-runtime
Diffstat (limited to 'mysql-test/include/mix1.inc')
| -rw-r--r-- | mysql-test/include/mix1.inc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index d1afb8bcf0b..3481d572514 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -742,7 +742,6 @@ 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 CREATE TABLE IF NOT EXISTS t2 (primary key (a)) select * from t1; SELECT * from t2; ROLLBACK; @@ -756,13 +755,11 @@ 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 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 CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) select * from t1; SELECT * from t2; ROLLBACK; |