diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-05 11:36:53 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-05-05 11:36:53 +0200 |
| commit | a903be5d964fcda2c7f6eb649885dbd98901fb72 (patch) | |
| tree | c4714d265a82b3c7aef7188853b439d8d54b8bf5 /sql/mysqld.h | |
| parent | 1f63feb91a027cdccbf3c14d513d11acf8aa7431 (diff) | |
| parent | 6935d66053b2c9723314d89d5169dcf34ed56c08 (diff) | |
| download | mariadb-git-10.2-wlad-merge.tar.gz | |
Merge commit '6935d66053b2c9723314d89d5169dcf34ed56c08' into bb-10.2-marko10.2-wlad-merge
# Conflicts:
# debian/control
# debian/mariadb-server-10.2.install
# include/my_sys.h
# mysql-test/collections/buildbot_suites.bat
# plugin/auth_dialog/CMakeLists.txt
# sql/CMakeLists.txt
# sql/sql_class.cc
# storage/innobase/CMakeLists.txt
# storage/innobase/log/log0crypt.cc
# win/packaging/CPackWixConfig.cmake
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 613b57b133d..4c864e90f1b 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -778,20 +778,6 @@ inline void dec_thread_running() extern void set_server_version(char *buf, size_t size); -#if defined(MYSQL_DYNAMIC_PLUGIN) && defined(_WIN32) -extern "C" THD *_current_thd_noinline(); -#define _current_thd() _current_thd_noinline() -#else -/* - THR_THD is a key which will be used to set/get THD* for a thread, - using my_pthread_setspecific_ptr()/my_thread_getspecific_ptr(). -*/ -extern pthread_key(THD*, THR_THD); -inline THD *_current_thd(void) -{ - return my_pthread_getspecific_ptr(THD*,THR_THD); -} -#endif #define current_thd _current_thd() inline int set_current_thd(THD *thd) { |