diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-04-27 21:04:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-27 21:04:06 +0200 |
| commit | 0f12ada6b6a390b8663151f5d8cfae2e6dc9c2bb (patch) | |
| tree | 5af5b81499f6137f45a37fc77cc518e40fd4ad72 /sql/sql_truncate.cc | |
| parent | e4df6e5799eec20a16e279f7e74e95f18cd475fe (diff) | |
| parent | e02fe87f00dc9fdb0fb6ab13f2e87485f79f3341 (diff) | |
| download | mariadb-git-0f12ada6b6a390b8663151f5d8cfae2e6dc9c2bb.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/sql_truncate.cc')
| -rw-r--r-- | sql/sql_truncate.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc index 92fc4205656..9b37996f377 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -288,6 +288,12 @@ static bool recreate_temporary_table(THD *thd, TABLE *table) table->file->info(HA_STATUS_AUTO | HA_STATUS_NO_LOCK); + /* + If LOCK TABLES list is not empty and contains this table + then unlock the table and remove it from this list. + */ + mysql_lock_remove(thd, thd->lock, table); + /* Don't free share. */ close_temporary_table(thd, table, FALSE, FALSE); |