database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Merge branch 'tmp' into tmp-10.1

Browse Source 
Conflicts:
	sql/slave.cc
This commit is contained in:
Kristian Nielsen
2016-01-15 13:01:19 +01:00
parent 55d61ec878 06b2e327fc
commit 2f88b14acd
6 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_parallel.result
View File

@@ -930,6 +930,8 @@ a
31
32
SET sql_slave_skip_counter= 1;
ERROR HY000: When using parallel replication and GTID with multiple replication domains, @@sql_slave_skip_counter can not be used. Instead, setting @@gtid_slave_pos explicitly can be used to skip to after a given GTID position.
include/stop_slave_io.inc
include/start_slave.inc
include/sync_with_master_gtid.inc
SELECT * FROM t2 WHERE a >= 30 ORDER BY a;