diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2020-03-21 19:46:49 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2020-03-21 19:58:44 +0400 |
| commit | 6acddd5367d51debb8ddf797a4a90f3e1d3c8a27 (patch) | |
| tree | 1b86a9a381a8e6e20f616c5b009dc68c3581c426 | |
| parent | 62687801ffedc8521e3dbb111f26e7668902949c (diff) | |
| download | mariadb-git-6acddd5367d51debb8ddf797a4a90f3e1d3c8a27.tar.gz | |
global_query_id: my_atomic to Atomic_counter
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/mysqld.h | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 563aee8b9d4..a5f1d396ff5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -483,7 +483,7 @@ ulonglong test_flags; ulonglong query_cache_size=0; ulong query_cache_limit=0; ulong executed_events=0; -query_id_t global_query_id; +Atomic_counter<query_id_t> global_query_id; ulong aborted_threads, aborted_connects, aborted_connects_preauth; ulong delayed_insert_timeout, delayed_insert_limit, delayed_queue_size; ulong delayed_insert_threads, delayed_insert_writes, delayed_rows_in_use; diff --git a/sql/mysqld.h b/sql/mysqld.h index 44db6c6216b..4d502afa428 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -23,7 +23,6 @@ #include "sql_bitmap.h" /* Bitmap */ #include "my_decimal.h" /* my_decimal */ #include "mysql_com.h" /* SERVER_VERSION_LENGTH */ -#include "my_atomic.h" #include "my_counter.h" #include "mysql/psi/mysql_file.h" /* MYSQL_FILE */ #include "mysql/psi/mysql_socket.h" /* MYSQL_SOCKET */ @@ -763,17 +762,17 @@ enum enum_query_type /* query_id */ -extern query_id_t global_query_id; +extern Atomic_counter<query_id_t> global_query_id; /* increment query_id and return it. */ inline __attribute__((warn_unused_result)) query_id_t next_query_id() { - return my_atomic_add64_explicit(&global_query_id, 1, MY_MEMORY_ORDER_RELAXED); + return global_query_id++; } inline query_id_t get_query_id() { - return my_atomic_load64_explicit(&global_query_id, MY_MEMORY_ORDER_RELAXED); + return global_query_id; } /* increment global_thread_id and return it. */ |