diff options
| author | unknown <kostja@bodhi.(none)> | 2007-08-31 10:58:02 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-08-31 10:58:02 +0400 |
| commit | a4b0ad6cf24daf75293a53ab069ecf056970f3dd (patch) | |
| tree | c73ad57c987c7c487989464c44ccbec6a1ae0813 /sql/handler.cc | |
| parent | 0458c3cfc8dbe6a0c3914047d9a21e31f87bb28b (diff) | |
| parent | ee040ef2b762d1a780a53bc347657484335b1a4c (diff) | |
| download | mariadb-git-a4b0ad6cf24daf75293a53ab069ecf056970f3dd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-12713-new
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 2cb3c5aa348..75c3a64bc27 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -561,7 +561,7 @@ static my_bool closecon_handlerton(THD *thd, plugin_ref plugin, be rolled back already */ if (hton->state == SHOW_OPTION_YES && hton->close_connection && - thd->ha_data[hton->slot]) + thd_get_ha_data(thd, hton)) hton->close_connection(hton, thd); return FALSE; } @@ -1509,7 +1509,7 @@ void handler::ha_statistic_increment(ulong SSV::*offset) const void **handler::ha_data(THD *thd) const { - return (void **) thd->ha_data + ht->slot; + return thd_ha_data(thd, ht); } THD *handler::ha_thd(void) const |