database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-07-05 19:08:55 +02:00
parent fc5932a1b7 e555540ab6
commit f6633bf058
99 changed files with 2787 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
mysql-test/suite/rpl/r/rpl_parallel_optimistic.result
View File

@ -560,6 +560,56 @@ a b
57 7
58 8
59 9
*** MDEV-8075: DROP TEMPORARY TABLE not marked as ddl, causing optimistic parallel replication to fail ***
connection server_2;
include/stop_slave.inc
connection server_1;
INSERT INTO t1 VALUES (40, 10);
CREATE TEMPORARY TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (41);
BEGIN;
INSERT INTO t2 SELECT a, 20 FROM t1;
DROP TEMPORARY TABLE t1;
COMMIT;
INSERT INTO t1 VALUES (42, 10);
include/save_master_gtid.inc
SELECT * FROM t1 WHERE a >= 40 ORDER BY a;
a b
40 10
42 10
SELECT * FROM t2 WHERE a >= 40 ORDER BY a;
a b
41 20
50 0
51 1
52 2
53 3
54 4
55 5
56 6
57 7
58 8
59 9
connection server_2;
include/start_slave.inc
include/sync_with_master_gtid.inc
SELECT * FROM t1 WHERE a >= 40 ORDER BY a;
a b
40 10
42 10
SELECT * FROM t2 WHERE a >= 40 ORDER BY a;
a b
41 20
50 0
51 1
52 2
53 3
54 4
55 5
56 6
57 7
58 8
59 9
connection server_2;
include/stop_slave.inc
SET GLOBAL slave_parallel_mode=@old_parallel_mode;