diff options
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 75376c53f68..2781eec4eaf 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -264,7 +264,7 @@ const char *set_thd_proc_info(THD *thd, const char *info, extern "C" void **thd_ha_data(const THD *thd, const struct handlerton *hton) { - return (void **) thd->ha_data + hton->slot; + return (void **) &thd->ha_data[hton->slot].ha_ptr; } extern "C" @@ -2513,7 +2513,7 @@ bool select_dumpvar::send_data(List<Item> &items) suv->update(); } } - DBUG_RETURN(0); + DBUG_RETURN(thd->is_error()); } bool select_dumpvar::send_eof() |