diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 17:34:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 17:34:49 +0300 |
| commit | a3539bbb2ac51dfa2b363d3b4c11784c25d1f256 (patch) | |
| tree | 6b49da1f15e5740adaf5da1c4179760a15b77dc4 /sql/sql_handler.cc | |
| parent | c98e6d4b3d4d17ee429c696ac07e0bc4bbe1a81e (diff) | |
| parent | 6f96ff7268dd20d6d3b61931c972e7a43c1efdff (diff) | |
| download | mariadb-git-a3539bbb2ac51dfa2b363d3b4c11784c25d1f256.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 02d5bbfc84f..faf9fcbe906 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -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; } /* |