database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge tag 'mariadb-5.5.43' into 5.5-galera

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-05-04 13:50:52 -04:00
parent 42f99d00ee 4c87f72773
commit d2562004c5
188 changed files with 5733 additions and 1152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_truncate.cc
View File

@@ -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
@@ -291,6 +291,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);