database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Post-merge fixes.

Browse Source 
sql/sql_base.cc:
  Fix an incorrect manual merge.
This commit is contained in:
unknown
2007-07-31 20:52:43 +04:00
parent 4c11e05ad2
commit 5404ba422e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_base.cc
View File

@@ -1701,18 +1701,18 @@ TABLE *find_temporary_table(THD *thd, TABLE_LIST *table_list)
@retval FALSE the table was found and dropped successfully. @retval FALSE the table was found and dropped successfully.
*/ */
bool close_temporary_table(THD *thd, const char *db, const char *table_name) bool close_temporary_table(THD *thd, TABLE_LIST *table_list)
{ {
TABLE *table; TABLE *table;
if (!(table= find_temporary_table(thd, table_list))) if (!(table= find_temporary_table(thd, table_list)))
return 1; return 1;
close_temporary_table(thd, table, 1, 1);
/* /*
If LOCK TABLES list is not empty and contains this table, If LOCK TABLES list is not empty and contains this table,
unlock the table and remove the table from this list. unlock the table and remove the table from this list.
*/ */
mysql_lock_remove(thd, thd->locked_tables, table, FALSE); mysql_lock_remove(thd, thd->locked_tables, table, FALSE);
close_temporary_table(thd, table, 1, 1);
return 0; return 0;
} }