1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge vtkachenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  vadima.volia.com:/root/mysql-5.1-new1
This commit is contained in:
vtkachenko@vadima.volia.com 2006-05-27 08:08:03 +03:00
commit 2e6b51579b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/mysql_priv.h
View File

@ -489,6 +489,7 @@ inline THD *_current_thd(void)
my_bool thd_in_lock_tables(const THD *thd); my_bool thd_in_lock_tables(const THD *thd);
my_bool thd_tablespace_op(const THD *thd); my_bool thd_tablespace_op(const THD *thd);
const char *thd_proc_info(THD *thd, const char *info); const char *thd_proc_info(THD *thd, const char *info);
void **thd_ha_data(const THD *thd, const struct handlerton *hton);
/* /*
External variables External variables

5
sql/sql_class.cc
View File

@ -186,6 +186,11 @@ const char *thd_proc_info(THD *thd, const char *info)
return old_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 Pass nominal parameters to Statement constructor only to ensure that