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

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Kristian Nielsen
2015-04-21 10:31:39 +02:00
parent 6876a7dc4e 4760528754
commit e7a7ea7ec1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl/r/rpl_parallel_temptable.result
View File

@ -130,7 +130,7 @@ SELECT * FROM t1 WHERE a >= 30 ORDER BY a;
a b a b
30 conservative 30 conservative
31 conservative 31 conservative
include/save_master_pos.inc include/save_master_gtid.inc
include/sync_with_master_gtid.inc include/sync_with_master_gtid.inc
SELECT * FROM t1 WHERE a >= 30 ORDER BY a; SELECT * FROM t1 WHERE a >= 30 ORDER BY a;
a b a b
@ -150,7 +150,7 @@ a b
31 conservative 31 conservative
32 optimistic 32 optimistic
33 optimistic 33 optimistic
include/save_master_pos.inc include/save_master_gtid.inc
include/start_slave.inc include/start_slave.inc
include/sync_with_master_gtid.inc include/sync_with_master_gtid.inc
SELECT * FROM t1 WHERE a >= 30 ORDER BY a; SELECT * FROM t1 WHERE a >= 30 ORDER BY a;

4
mysql-test/suite/rpl/t/rpl_parallel_temptable.test
View File

@ -226,7 +226,7 @@ SET SESSION debug_dbug= @old_dbug;
INSERT INTO t1 SELECT a, "conservative" FROM t4; INSERT INTO t1 SELECT a, "conservative" FROM t4;
DROP TEMPORARY TABLE t4; DROP TEMPORARY TABLE t4;
SELECT * FROM t1 WHERE a >= 30 ORDER BY a; SELECT * FROM t1 WHERE a >= 30 ORDER BY a;
--source include/save_master_pos.inc --source include/save_master_gtid.inc
--connection server_2 --connection server_2
--source include/sync_with_master_gtid.inc --source include/sync_with_master_gtid.inc
@ -245,7 +245,7 @@ INSERT INTO t1 SELECT a, "optimistic" FROM t4;
DROP TEMPORARY TABLE t4; DROP TEMPORARY TABLE t4;
SELECT * FROM t1 WHERE a >= 30 ORDER BY a; SELECT * FROM t1 WHERE a >= 30 ORDER BY a;
--source include/save_master_pos.inc --source include/save_master_gtid.inc
--connection server_2 --connection server_2
--source include/start_slave.inc --source include/start_slave.inc