diff options
| author | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
| commit | 3cad31f2a758f797ef0acac5625d0e007ecbce93 (patch) | |
| tree | 73c054636c4858b2a51eddf7eaa653746d67524e /sql/mysqld.h | |
| parent | 560b9895d413bdfedda0a0ca871a635858990c05 (diff) | |
| parent | 5c057b3fef3aa92cfadbd63043799b430132a494 (diff) | |
| download | mariadb-git-3cad31f2a758f797ef0acac5625d0e007ecbce93.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 57698dc5d9b..5c6ad695354 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -732,15 +732,7 @@ inline query_id_t get_query_id() } /* increment global_thread_id and return it. */ -inline __attribute__((warn_unused_result)) my_thread_id next_thread_id() -{ - return my_atomic_add64_explicit((int64*) &global_thread_id, 1, MY_MEMORY_ORDER_RELAXED); -} - -#if defined(MYSQL_DYNAMIC_PLUGIN) && defined(_WIN32) -extern "C" my_thread_id next_thread_id_noinline(); -#define next_thread_id() next_thread_id_noinline() -#endif +extern __attribute__((warn_unused_result)) my_thread_id next_thread_id(void); /* TODO: Replace this with an inline function. |