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 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-05-29 17:34:49 +03:00
parent c98e6d4b3d 6f96ff7268
commit a3539bbb2a
76 changed files with 1593 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_handler.cc
View File

@ -195,13 +195,14 @@ static void mysql_ha_close_childs(THD *thd, TABLE_LIST *current_table_list,
static void mysql_ha_close_table(SQL_HANDLER *handler)
{
DBUG_ENTER("mysql_ha_close_table");
THD *thd= handler->thd;
TABLE *table= handler->table;
TABLE_LIST *current_table_list= NULL, *next_global;
/* check if table was already closed */
if (!table)
return;
DBUG_VOID_RETURN;
if ((next_global= table->file->get_next_global_for_child()))
current_table_list= next_global->parent_l;
@ -232,6 +233,7 @@ static void mysql_ha_close_table(SQL_HANDLER *handler)
}
my_free(handler->lock);
handler->init();
DBUG_VOID_RETURN;
}
/*