diff options
author | Michael Widenius <monty@mariadb.org> | 2014-03-12 11:26:40 +0200 |
---|---|---|
committer | Michael Widenius <monty@mariadb.org> | 2014-03-12 11:26:40 +0200 |
commit | f320b12ca52aa32e1a83130a1acbbba6496bb6f1 (patch) | |
tree | 5897482af38f74ff343506b7e3096fbf76b5594b /sql/handler.h | |
parent | 49ca12a107d6a6f3e18729e6481090077b1f1bf8 (diff) | |
download | mariadb-git-f320b12ca52aa32e1a83130a1acbbba6496bb6f1.tar.gz |
MDEV-5619: CREATE OR REPLACE does not release MDL_EXCLUSIVE upon failure
mysql-test/r/create_or_replace.result:
Added test of releasing of metadata locks
mysql-test/t/create_or_replace.test:
Added test of releasing of metadata locks
sql/handler.h:
Added marker if table was deleted as part of CREATE OR REPLACE
sql/sql_base.cc:
Added Locked_tables_list::unlock_locked_table()
sql/sql_class.h:
New prototypes
sql/sql_insert.cc:
Unlock metadata locks for deleted table in case of error. Also do unlock tables if this was the only locked table.
sql/sql_table.cc:
Unlock metadata locks for deleted table in case of error. Also do unlock tables if this was the only locked table.
Diffstat (limited to 'sql/handler.h')
-rw-r--r-- | sql/handler.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h index 06bc1863bbe..e67e68be931 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1621,6 +1621,7 @@ struct HA_CREATE_INFO TABLE *table; TABLE_LIST *pos_in_locked_tables; MDL_ticket *mdl_ticket; + bool table_was_deleted; bool tmp_table() { return options & HA_LEX_CREATE_TMP_TABLE; } }; |