diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-12-16 20:49:57 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-12-16 20:49:57 +0200 |
| commit | b31909ffbb967b147b9570af4ff7d03de6d5912c (patch) | |
| tree | 78d72d4c5fa2c003d5402fa30e3c183853c4f8d0 /sql | |
| parent | 33f3a11e2db38fad3c43ce3c1a30dc8d72bd53bd (diff) | |
| download | mariadb-git-b31909ffbb967b147b9570af4ff7d03de6d5912c.tar.gz | |
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.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_base.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index fd33881e049..75b69eebfa9 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4779,6 +4779,7 @@ lock_table_names(THD *thd, */ if (check_if_table_exists(thd, tables_start, 1, &exists)) DBUG_RETURN(TRUE); // Should never happen + thd->warning_info->clear_warning_info(thd->query_id); thd->clear_error(); // Forget timeout error if (exists) { |