diff options
| author | Monty <monty@mariadb.org> | 2016-02-08 22:34:41 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-02-08 22:34:41 +0200 |
| commit | b3093073b1ec076ad7ef5ef8b8fca9022864a890 (patch) | |
| tree | 4a703f74b194efb2d02b2acfcf8d91f03deaa1f5 /sql/mysqld.h | |
| parent | 1ab711bebbd961b8882acf0ac0fbdd1971d54597 (diff) | |
| download | mariadb-git-b3093073b1ec076ad7ef5ef8b8fca9022864a890.tar.gz | |
Changed my_thread_id to int64 to fix compilation problem with
my_atomic_add32_explicit on windows
Fixed that server_audit.c also works if one compiles with safemalloc
Fixed compiler warnings
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 84920df7095..cb6bc849912 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -707,7 +707,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_add32_explicit(&global_thread_id, 1, MY_MEMORY_ORDER_RELAXED); + return my_atomic_add64_explicit(&global_thread_id, 1, MY_MEMORY_ORDER_RELAXED); } #if defined(MYSQL_DYNAMIC_PLUGIN) && defined(_WIN32) |