diff options
| author | Monty <monty@mariadb.org> | 2018-05-24 18:56:33 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-05-24 18:57:52 +0300 |
| commit | 494c981d232678a3ba73abbe1502ddb0f95efcdc (patch) | |
| tree | d01f70d42f4928906f20c7672dc0cf6538e1647e /sql/sql_handler.cc | |
| parent | 72a8d29e00d4deec7c836228b54e19fa35ab7ad7 (diff) | |
| parent | bfed1bfe28980d3b1404f99a44712242a5108ef5 (diff) | |
| download | mariadb-git-494c981d232678a3ba73abbe1502ddb0f95efcdc.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
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 4a27244f5b9..2a3454703f4 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -155,10 +155,11 @@ static void mysql_ha_close_table(SQL_HANDLER *handler) { THD *thd= handler->thd; TABLE *table= handler->table; + DBUG_ENTER("mysql_ha_close_table"); /* check if table was already closed */ if (!table) - return; + DBUG_VOID_RETURN; if (!table->s->tmp_table) { @@ -183,6 +184,7 @@ static void mysql_ha_close_table(SQL_HANDLER *handler) } my_free(handler->lock); handler->init(); + DBUG_VOID_RETURN; } /* |