1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-18497 : CTAS async replication from mariadb master crashes galera nodes (#1410)

Browse Source 
In MariaDB 10.2 master could have been configured so that there
is extra annotate events. When we peak next event type for CTAS we
need to skip annotate events.
This commit is contained in:
Jan Lindström 2019-12-04 11:46:37 +02:00
parent f7d35ffc76
commit c9b9eb3315
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/suite/galera/r/galera_as_slave_ctas.result
View File

@ -1,14 +1,28 @@
connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
connection node_2;
START SLAVE; START SLAVE;
connection node_1;
SHOW VARIABLES LIKE 'binlog_format'; SHOW VARIABLES LIKE 'binlog_format';
Variable_name Value Variable_name Value
binlog_format ROW binlog_format ROW
connection node_1;
CREATE TABLE source (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE source (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
CREATE TABLE target AS SELECT * FROM source; CREATE TABLE target AS SELECT * FROM source;
connection node_2;
connection node_3;
connection node_1;
DROP TABLE target; DROP TABLE target;
INSERT INTO source VALUES(1); INSERT INTO source VALUES(1);
CREATE TABLE target AS SELECT * FROM source; CREATE TABLE target AS SELECT * FROM source;
connection node_2;
connection node_3;
connection node_1;
DROP TABLE source; DROP TABLE source;
DROP TABLE target; DROP TABLE target;
connection node_3;
connection node_2;
STOP SLAVE; STOP SLAVE;
RESET SLAVE ALL; RESET SLAVE ALL;
connection node_1;
RESET MASTER; RESET MASTER;

24
sql/slave.cc
View File

@ -7397,24 +7397,30 @@ err:
#ifdef WITH_WSREP #ifdef WITH_WSREP
enum Log_event_type wsrep_peak_event(rpl_group_info *rgi, ulonglong* event_size) enum Log_event_type wsrep_peak_event(rpl_group_info *rgi, ulonglong* event_size)
{ {
enum Log_event_type ev_type;
mysql_mutex_lock(&rgi->rli->data_lock); mysql_mutex_lock(&rgi->rli->data_lock);
unsigned long long event_pos= rgi->event_relay_log_pos; unsigned long long event_pos= rgi->event_relay_log_pos;
unsigned long long orig_future_pos= rgi->future_event_relay_log_pos;
unsigned long long future_pos= rgi->future_event_relay_log_pos; unsigned long long future_pos= rgi->future_event_relay_log_pos;
/* scan the log to read next event */ /* scan the log to read next event and we skip
my_b_seek(rgi->rli->cur_log, future_pos); annotate events. */
rgi->rli->event_relay_log_pos= future_pos; do {
rgi->event_relay_log_pos= future_pos; my_b_seek(rgi->rli->cur_log, future_pos);
rgi->rli->event_relay_log_pos= future_pos;
Log_event* ev = next_event(rgi, event_size); rgi->event_relay_log_pos= future_pos;
enum Log_event_type ev_type= (ev) ? ev->get_type_code() : UNKNOWN_EVENT; Log_event* ev= next_event(rgi, event_size);
delete ev; ev_type= (ev) ? ev->get_type_code() : UNKNOWN_EVENT;
delete ev;
future_pos+= *event_size;
} while (ev_type == ANNOTATE_ROWS_EVENT);
/* scan the log back and re-set the positions to original values */ /* scan the log back and re-set the positions to original values */
rgi->rli->event_relay_log_pos= event_pos; rgi->rli->event_relay_log_pos= event_pos;
rgi->event_relay_log_pos= event_pos; rgi->event_relay_log_pos= event_pos;
my_b_seek(rgi->rli->cur_log, future_pos); my_b_seek(rgi->rli->cur_log, orig_future_pos);
mysql_mutex_unlock(&rgi->rli->data_lock); mysql_mutex_unlock(&rgi->rli->data_lock);