diff options
| author | unknown <vtkachenko@vadima.volia.com> | 2006-05-27 08:08:03 +0300 |
|---|---|---|
| committer | unknown <vtkachenko@vadima.volia.com> | 2006-05-27 08:08:03 +0300 |
| commit | e05d55de5ff6c95143fb1096da8019ab5fb7c6a2 (patch) | |
| tree | e8a7b11b118201c300c20e674a0afab1d0c0a2e0 | |
| parent | 6848d07f74244a81230bbbf41f763c0f64cfc876 (diff) | |
| parent | fed043a8528a60ceece05ee4622906d4ded4362c (diff) | |
| download | mariadb-git-e05d55de5ff6c95143fb1096da8019ab5fb7c6a2.tar.gz | |
Merge vtkachenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into vadima.volia.com:/root/mysql-5.1-new1
sql/sql_class.cc:
Auto merged
| -rw-r--r-- | sql/mysql_priv.h | 1 | ||||
| -rw-r--r-- | sql/sql_class.cc | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 7f40bd2bc57..e3db96be2e7 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -489,6 +489,7 @@ inline THD *_current_thd(void) my_bool thd_in_lock_tables(const THD *thd); my_bool thd_tablespace_op(const THD *thd); const char *thd_proc_info(THD *thd, const char *info); +void **thd_ha_data(const THD *thd, const struct handlerton *hton); /* External variables diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 9b2ad209e84..b4a7f9abc1c 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -186,6 +186,11 @@ const char *thd_proc_info(THD *thd, const char *info) return old_info; } +void **thd_ha_data(const THD *thd, const struct handlerton *hton) +{ + return (void **) thd->ha_data + hton->slot; +} + /* Pass nominal parameters to Statement constructor only to ensure that |