summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2018-12-28 18:51:13 +0400
committerSergey Vojtovich <svoj@mariadb.org>2018-12-29 14:09:15 +0400
commitd2bdd789150691533698d3949041d867aa9b3bd6 (patch)
tree90b58c5ad431a10a38875749c9c2eccf84ffb601 /sql/slave.cc
parent656a702ca9318c58fde97e19ba7b242d11c05c56 (diff)
downloadmariadb-git-d2bdd789150691533698d3949041d867aa9b3bd6.tar.gz
Master_info counters transition to Atomic_counter
Diffstat (limited to 'sql/slave.cc')
-rw-r--r--sql/slave.cc13
1 files changed, 3 insertions, 10 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 03b730b2b00..5fbe0c77661 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -3407,16 +3407,9 @@ static bool send_show_master_info_data(THD *thd, Master_info *mi, bool full,
// Slave_SQL_Running_State
protocol->store(slave_sql_running_state, &my_charset_bin);
- uint64 events;
- events= (uint64)my_atomic_load64_explicit((volatile int64 *)
- &mi->total_ddl_groups, MY_MEMORY_ORDER_RELAXED);
- protocol->store(events);
- events= (uint64)my_atomic_load64_explicit((volatile int64 *)
- &mi->total_non_trans_groups, MY_MEMORY_ORDER_RELAXED);
- protocol->store(events);
- events= (uint64)my_atomic_load64_explicit((volatile int64 *)
- &mi->total_trans_groups, MY_MEMORY_ORDER_RELAXED);
- protocol->store(events);
+ protocol->store(mi->total_ddl_groups);
+ protocol->store(mi->total_non_trans_groups);
+ protocol->store(mi->total_trans_groups);
if (full)
{