diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2020-03-21 17:36:38 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2020-03-21 17:36:38 +0400 |
| commit | a39d92ca574e275acaf4240629d4bee5f9ece3f6 (patch) | |
| tree | f67da71aeaef50ae0f9e673604a0a1f90b963b9c /sql/slave.cc | |
| parent | 4d9977e5ff9843e132fda480536192caaf69aba2 (diff) | |
| download | mariadb-git-a39d92ca574e275acaf4240629d4bee5f9ece3f6.tar.gz | |
gtid_pos_table: my_atomic to std::atomic
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 714e47424fe..fcb4777b189 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -397,8 +397,8 @@ handle_gtid_pos_auto_create_request(THD *thd, void *hton) /* Find the entry for the table to auto-create. */ mysql_mutex_lock(&rpl_global_gtid_slave_state->LOCK_slave_state); - entry= (rpl_slave_state::gtid_pos_table *) - rpl_global_gtid_slave_state->gtid_pos_tables; + entry= rpl_global_gtid_slave_state-> + gtid_pos_tables.load(std::memory_order_relaxed); while (entry) { if (entry->table_hton == hton && @@ -434,8 +434,8 @@ handle_gtid_pos_auto_create_request(THD *thd, void *hton) /* Now enable the entry for the auto-created table. */ mysql_mutex_lock(&rpl_global_gtid_slave_state->LOCK_slave_state); - entry= (rpl_slave_state::gtid_pos_table *) - rpl_global_gtid_slave_state->gtid_pos_tables; + entry= rpl_global_gtid_slave_state-> + gtid_pos_tables.load(std::memory_order_relaxed); while (entry) { if (entry->table_hton == hton && |