database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-28 17:36:30 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-09-04 17:52:04 +03:00
parent 647d5b2430 f605ce08b5
commit 537f8594a6
33 changed files with 459 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/suite/rpl/r/mdev_17588.result
View File

@@ -1,18 +1,16 @@
include/master-slave.inc
[connection master]
connection slave;
include/stop_slave.inc
CHANGE MASTER TO master_use_gtid=slave_pos;
include/start_slave.inc
connection master;
create table t1 (a int) engine=innodb;
create table t2 (a int);
create table t3 (a int) engine=innodb;
include/save_master_gtid.inc
connection slave;
include/wait_for_slave_sql_error.inc [errno=1286]
Last_Error = 'Error 'Unknown storage engine 'innodb'' on query. Default database: 'test'. Query: 'create table t1 (a int) engine=innodb''
STOP SLAVE IO_THREAD;
include/wait_for_slave_to_stop.inc
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
include/start_slave.inc
include/sync_with_master_gtid.inc
include/wait_for_slave_sql_error_and_skip.inc [errno=1286]
# Asserted this: Status should be 'Slave has read all relay log...'
show tables;
Tables_in_test
t2