diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-23 10:50:14 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-23 10:50:14 +0200 |
| commit | 3b250837858c137f3a4082af6c0a20f95fde31d4 (patch) | |
| tree | 9224188f329bb77443e9eb35680f91039e51adaf /sql/mysqld.cc | |
| parent | 1a4998e98271ffd8126331336c4c4ae71029afc7 (diff) | |
| parent | f7599f47999bb197dba36e54d0d5677b3b15f12a (diff) | |
| download | mariadb-git-3b250837858c137f3a4082af6c0a20f95fde31d4.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 387482ef6f0..e2fff60db3b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -479,7 +479,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; @@ -7631,7 +7631,7 @@ SHOW_VAR status_vars[]= { {"Subquery_cache_miss", (char*) &subquery_cache_miss, SHOW_LONG}, {"Table_locks_immediate", (char*) &locks_immediate, SHOW_LONG}, {"Table_locks_waited", (char*) &locks_waited, SHOW_LONG}, - {"Table_open_cache_active_instances", (char*) &tc_active_instances, SHOW_UINT}, + {"Table_open_cache_active_instances", (char*) &show_tc_active_instances, SHOW_SIMPLE_FUNC}, {"Table_open_cache_hits", (char*) offsetof(STATUS_VAR, table_open_cache_hits), SHOW_LONGLONG_STATUS}, {"Table_open_cache_misses", (char*) offsetof(STATUS_VAR, table_open_cache_misses), SHOW_LONGLONG_STATUS}, {"Table_open_cache_overflows", (char*) offsetof(STATUS_VAR, table_open_cache_overflows), SHOW_LONGLONG_STATUS}, |