1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Merge remote-tracking branch 'mysql/5.5' into 5.5

This commit is contained in:
Sergei Golubchik
2015-04-27 21:04:06 +02:00
28 changed files with 496 additions and 90 deletions

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
@ -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);