From b31909ffbb967b147b9570af4ff7d03de6d5912c Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Sun, 16 Dec 2012 20:49:57 +0200 Subject: Removed lock wait timeout warning when using CREATE TABLE IF EXISTS mysql-test/r/create.result: Added test case to show that CREATE TABLE also is not waiting if table exists. mysql-test/t/create.test: Added test case to show that CREATE TABLE also is not waiting if table exists. sql/sql_base.cc: Clear also warnings from acquire_locks if we retry. --- mysql-test/t/create.test | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mysql-test/t/create.test') diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index c472c9f0a05..4c9592e9dab 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -2013,6 +2013,12 @@ create table if not exists t1 (a int, b int); create table if not exists t1 (a int, b int) select 2,2; --error ER_TABLE_EXISTS_ERROR create table if not exists t1 like t2; +--error ER_TABLE_EXISTS_ERROR +create table t1 (a int, b int); +--error ER_TABLE_EXISTS_ERROR +create table t1 (a int, b int) select 2,2; +--error ER_TABLE_EXISTS_ERROR +create table t1 like t2; disconnect user1; connection default; select * from t1; -- cgit v1.2.1