database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2015-05-04 22:00:24 +02:00
parent ae18a28500 4c87f72773
commit 49c853fb94
179 changed files with 5739 additions and 1214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_truncate.cc
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2010, 2014, Oracle and/or its affiliates.
Copyright (c) 2013, 2014, SkySQL Ab.
/* Copyright (c) 2010, 2015, Oracle and/or its affiliates.
Copyright (c) 2013, 2015, MariaDB
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
@ -283,6 +283,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);