diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-06-10 10:59:49 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-06-10 10:59:49 +0200 |
| commit | 31b79618e34a36ff24d2e1a6186258dc18e12aa5 (patch) | |
| tree | 41fa2696a71a46f4885a21cf7c58dc438a600d7a /sql/sql_class.cc | |
| parent | 518e2498534cd996544238eb50d7e71da026ae19 (diff) | |
| download | mariadb-git-31b79618e34a36ff24d2e1a6186258dc18e12aa5.tar.gz | |
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index cf5fdcf27a7..f003a9c502b 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -746,6 +746,12 @@ void thd_get_xid(const MYSQL_THD thd, MYSQL_XID *xid) *xid = *(MYSQL_XID *) &thd->transaction.xid_state.xid; } +#ifdef _WIN32 +extern "C" THD *_current_thd_noinline(void) +{ + return my_pthread_getspecific_ptr(THD*,THR_THD); +} +#endif /* Init common variables that has to be reset on start and on change_user */ |