diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-06-01 21:52:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-06-01 21:52:20 +0200 |
| commit | ffc8f62b08982cc1f2fabf8b4b38bd124c115a97 (patch) | |
| tree | da42637b1ae9402a7436b715f9c0db57cdddc87a /sql/handler.cc | |
| parent | 6b157f6be3cb056a93eb925df3880098c871b32a (diff) | |
| parent | 0fc39acb8125fae95062e7b680b022b075a308c3 (diff) | |
| download | mariadb-git-ffc8f62b08982cc1f2fabf8b4b38bd124c115a97.tar.gz | |
merge 5.1->5.2
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 19c615a289c..9c3f35e8647 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -160,7 +160,7 @@ redo: } -plugin_ref ha_lock_engine(THD *thd, handlerton *hton) +plugin_ref ha_lock_engine(THD *thd, const handlerton *hton) { if (hton) { @@ -602,9 +602,13 @@ static my_bool closecon_handlerton(THD *thd, plugin_ref plugin, there's no need to rollback here as all transactions must be rolled back already */ - if (hton->state == SHOW_OPTION_YES && hton->close_connection && - thd_get_ha_data(thd, hton)) - hton->close_connection(hton, thd); + if (hton->state == SHOW_OPTION_YES && thd_get_ha_data(thd, hton)) + { + if (hton->close_connection) + hton->close_connection(hton, thd); + /* make sure ha_data is reset and ha_data_lock is released */ + thd_set_ha_data(thd, hton, NULL); + } return FALSE; } |