1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge branch '10.0' into 10.1

This commit is contained in:
Sergei Golubchik
2018-12-29 23:44:45 +01:00
30 changed files with 284 additions and 104 deletions

View File

@@ -67,6 +67,18 @@ a
-3
1
include/check_slave_no_error.inc
drop table t1, t2;
DROP TABLE t1, t2;
include/check_slave_no_error.inc
create database d;
create database e;
create database d;
create database if not exists e;
include/check_slave_no_error.inc
drop database d;
drop database e;
drop database d;
drop database if exists e;
include/check_slave_no_error.inc
SET @@global.slave_exec_mode= @old_slave_exec_mode;
include/rpl_end.inc

View File

@@ -75,9 +75,30 @@ SELECT * FROM t1 ORDER BY a;
SELECT * FROM t2 ORDER BY a;
--source include/check_slave_no_error.inc
connection slave;
drop table t1, t2;
connection master;
DROP TABLE t1, t2;
sync_slave_with_master;
--source include/check_slave_no_error.inc
create database d;
create database e;
connection master;
create database d;
create database if not exists e;
sync_slave_with_master;
--source include/check_slave_no_error.inc
drop database d;
drop database e;
connection master;
drop database d;
drop database if exists e;
sync_slave_with_master;
--source include/check_slave_no_error.inc
SET @@global.slave_exec_mode= @old_slave_exec_mode;