summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/main/invisible_partition.test1
-rw-r--r--sql/log_event.cc9
2 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/main/invisible_partition.test b/mysql-test/main/invisible_partition.test
index 0a016be1357..dd3b3eeaaae 100644
--- a/mysql-test/main/invisible_partition.test
+++ b/mysql-test/main/invisible_partition.test
@@ -1,5 +1,6 @@
--source include/have_partition.inc
--source include/have_binlog_format_row.inc
+--source include/have_debug.inc
CREATE TABLE t1 (a INT NOT NULL, KEY (a)) ENGINE=MEMORY PARTITION BY KEY(a) PARTITIONS 4;
INSERT INTO t1 VALUES (1),(2);
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 67c58a12d5a..8c089ded4e1 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -7979,13 +7979,16 @@ Gtid_log_event::do_apply_event(rpl_group_info *rgi)
switch (flags2 & (FL_DDL | FL_TRANSACTIONAL))
{
case FL_TRANSACTIONAL:
- my_atomic_add64_explicit(&mi->total_trans_groups, 1, MY_MEMORY_ORDER_RELAXED);
+ my_atomic_add64_explicit((volatile int64 *)&mi->total_trans_groups, 1,
+ MY_MEMORY_ORDER_RELAXED);
break;
case FL_DDL:
- my_atomic_add64_explicit(&mi->total_ddl_groups, 1, MY_MEMORY_ORDER_RELAXED);
+ my_atomic_add64_explicit((volatile int64 *)&mi->total_ddl_groups, 1,
+ MY_MEMORY_ORDER_RELAXED);
break;
default:
- my_atomic_add64_explicit(&mi->total_non_trans_groups, 1, MY_MEMORY_ORDER_RELAXED);
+ my_atomic_add64_explicit((volatile int64 *)&mi->total_non_trans_groups, 1,
+ MY_MEMORY_ORDER_RELAXED);
}
if (flags2 & FL_STANDALONE)