summaryrefslogtreecommitdiff
path: root/mysql-test/include/deadlock.inc
diff options
context:
space:
mode:
authorunknown <Li-Bing.Song@sun.com>2010-08-18 17:35:41 +0800
committerunknown <Li-Bing.Song@sun.com>2010-08-18 17:35:41 +0800
commitd0d8bbed5e901e59044be6bcaa6d4020238a1eb4 (patch)
treec731d148d97af93063d14bda3e39d1ac5f45a74e /mysql-test/include/deadlock.inc
parente28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e (diff)
downloadmariadb-git-d0d8bbed5e901e59044be6bcaa6d4020238a1eb4.tar.gz
WL#5370 Keep forward-compatibility when changing
'CREATE TABLE IF NOT EXISTS ... SELECT' behaviour BUG#47132, BUG#47442, BUG49494, BUG#23992 and BUG#48814 will disappear automatically after the this patch. BUG#55617 is fixed by this patch too. This is the 5.5 part. It implements: - 'CREATE TABLE IF NOT EXISTS ... SELECT' statement will not insert anything and binlog anything if the table already exists. It only generate a warning that table already exists. - A couple of test cases for the behavior changing.
Diffstat (limited to 'mysql-test/include/deadlock.inc')
-rw-r--r--mysql-test/include/deadlock.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/deadlock.inc b/mysql-test/include/deadlock.inc
index 89c34abc871..84d23b80811 100644
--- a/mysql-test/include/deadlock.inc
+++ b/mysql-test/include/deadlock.inc
@@ -159,7 +159,7 @@ drop table if exists A;
create table A (c int);
insert into A (c) values (0);
---error 0,ER_LOCK_DEADLOCK,ER_UPDATE_TABLE_USED
+--error 0,ER_LOCK_DEADLOCK,ER_TABLE_EXISTS_ERROR
create table a as select * from A;
drop table A;