diff options
| author | Monty <monty@mariadb.org> | 2018-05-24 11:08:02 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-05-24 11:08:02 +0300 |
| commit | e744c687ca2c2523b63d5ac0066276a6cb3e932f (patch) | |
| tree | 7d3fbd9457d9a6f074d4c8dbb925fcb65730e135 /sql/sql_handler.cc | |
| parent | 5797cbaf4ab93cdae191486c6c82be79b83c56d2 (diff) | |
| parent | a816aa066e5c879a92819d694a93d245e6ec6e47 (diff) | |
| download | mariadb-git-e744c687ca2c2523b63d5ac0066276a6cb3e932f.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into 10.1
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 662fa33dc9f..8aee34a484d 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) { @@ -184,6 +185,7 @@ static void mysql_ha_close_table(SQL_HANDLER *handler) } my_free(handler->lock); handler->init(); + DBUG_VOID_RETURN; } /* |