Skip to content

Commit 6373ec3

Browse files
dr-mdr-m
committed
Merge 10.2 into 10.3
2 parents e709eb9 + d595a91 commit 6373ec3

36 files changed

+2729
-358
lines changed

‎mysql-test/suite/galera/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ MW-286 : MDEV-18464 Killing thread can cause mutex deadlock if done concurrently
1414
MW-328A : MDEV-21483 galera.MW-328A galera.MW-328B
1515
MW-328B : MDEV-21483 galera.MW-328A galera.MW-328B
1616
MW-329 : MDEV-19962 Galera test failure on MW-329
17-
MW-336 : MDEV-17062 Test failure on galera.MW-336
1817
galera.galera_defaults : MDEV-21494 Galera test sporadic failure on galera.galera_defaults
1918
galera_account_management : MariaDB 10.0 does not support ALTER USER
2019
galera_as_master_gtid : Requires MySQL GTID

‎mysql-test/suite/innodb/r/innodb_bug30113362.result

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
SET GLOBAL innodb_adaptive_hash_index = false;
2+
SET GLOBAL innodb_stats_persistent = false;
3+
connect purge_control,localhost,root,,;
4+
START TRANSACTION WITH CONSISTENT SNAPSHOT;
5+
connect con2,localhost,root,,;
6+
CREATE TABLE t1 (
7+
a00 CHAR(255) NOT NULL DEFAULT 'a',
8+
a01 CHAR(255) NOT NULL DEFAULT 'a',
9+
a02 CHAR(255) NOT NULL DEFAULT 'a',
10+
b INT NOT NULL DEFAULT 0,
11+
PRIMARY KEY(a00, a01, a02)
12+
) charset latin1 ENGINE = InnoDB COMMENT='MERGE_THRESHOLD=45';
13+
SET GLOBAL innodb_limit_optimistic_insert_debug = 3;
14+
CREATE PROCEDURE data_load_t1()
15+
BEGIN
16+
DECLARE c1 INT DEFAULT 97;
17+
DECLARE c2 INT DEFAULT 97;
18+
DECLARE c3 INT DEFAULT 97;
19+
WHILE c1 < 102 DO
20+
WHILE c2 < 123 DO
21+
WHILE c3 < 123 DO
22+
INSERT INTO t1 (a00) VALUES (CHAR(c1,c2,c3));
23+
SET c3 = c3 + 1;
24+
END WHILE;
25+
SET c3 = 97;
26+
SET c2 = c2 + 1;
27+
END WHILE;
28+
SET c2 = 97;
29+
SET c1 = c1 + 1;
30+
END WHILE;
31+
END |
32+
call data_load_t1();
33+
DROP PROCEDURE data_load_t1;
34+
ANALYZE TABLE t1;
35+
Table Op Msg_type Msg_text
36+
test.t1 analyze status OK
37+
SELECT CLUST_INDEX_SIZE FROM information_schema.INNODB_SYS_TABLESTATS WHERE NAME = 'test/t1';
38+
CLUST_INDEX_SIZE
39+
1856
40+
connection con2;
41+
DELETE FROM t1 WHERE a00 = 'cnm';
42+
COMMIT;
43+
BEGIN;
44+
INSERT INTO t1 SET a00 = 'cnm';
45+
connection purge_control;
46+
COMMIT;
47+
connection con2;
48+
SET GLOBAL innodb_limit_optimistic_insert_debug = 0;
49+
ROLLBACK;
50+
# Test start
51+
connection purge_control;
52+
START TRANSACTION WITH CONSISTENT SNAPSHOT;
53+
connection con2;
54+
DELETE FROM t1 WHERE a00 = 'bii';
55+
COMMIT;
56+
BEGIN;
57+
INSERT INTO t1 SET a00 = 'bii';
58+
SET DEBUG_SYNC = 'rollback_undo_pk SIGNAL roll1_wait WAIT_FOR roll2';
59+
SET DEBUG_SYNC = 'rollback_purge_clust SIGNAL rollback_waiting WAIT_FOR resume';
60+
ROLLBACK;
61+
connection purge_control;
62+
SET DEBUG_SYNC = 'now WAIT_FOR roll1_wait';
63+
COMMIT;
64+
SET DEBUG_SYNC = 'now SIGNAL roll2';
65+
connect con1,localhost,root,,;
66+
SET DEBUG_SYNC = 'now WAIT_FOR rollback_waiting';
67+
SET DEBUG_SYNC = 'rw_s_lock_waiting SIGNAL lockwait1';
68+
SELECT a00 FROM t1 WHERE a00 = 'bii';
69+
connection default;
70+
SET DEBUG_SYNC = 'now WAIT_FOR lockwait1';
71+
SET DEBUG_SYNC = 'now SIGNAL resume';
72+
connection con1;
73+
a00
74+
connection con2;
75+
connection default;
76+
ANALYZE TABLE t1;
77+
Table Op Msg_type Msg_text
78+
test.t1 analyze status OK
79+
SELECT CLUST_INDEX_SIZE FROM information_schema.INNODB_SYS_TABLESTATS WHERE NAME = 'test/t1';
80+
CLUST_INDEX_SIZE
81+
1856
82+
DELETE FROM t1 WHERE a00 = 'dpn';
83+
COMMIT;
84+
INSERT INTO t1 SET a00 = 'dpn';
85+
ROLLBACK;
86+
ALTER TABLE t1 COMMENT='MERGE_THRESHOLD=35';
87+
connection purge_control;
88+
START TRANSACTION WITH CONSISTENT SNAPSHOT;
89+
connection con2;
90+
DELETE FROM t1 WHERE a00 = 'cnd';
91+
COMMIT;
92+
BEGIN;
93+
INSERT INTO t1 SET a00 = 'cnd';
94+
SET DEBUG_SYNC = 'rollback_undo_pk SIGNAL roll1_wait WAIT_FOR roll2';
95+
SET DEBUG_SYNC = 'rollback_purge_clust SIGNAL rollback_waiting WAIT_FOR resume EXECUTE 2';
96+
ROLLBACK;
97+
connection purge_control;
98+
SET DEBUG_SYNC = 'now WAIT_FOR roll1_wait';
99+
START TRANSACTION WITH CONSISTENT SNAPSHOT;
100+
SET DEBUG_SYNC = 'now SIGNAL roll2';
101+
connection con1;
102+
SET DEBUG_SYNC = 'now WAIT_FOR rollback_waiting TIMEOUT 1';
103+
SET DEBUG_SYNC = 'now SIGNAL resume';
104+
SET DEBUG_SYNC = 'now WAIT_FOR rollback_waiting TIMEOUT 1';
105+
disconnect purge_control;
106+
connection default;
107+
SET DEBUG_SYNC = 'now SIGNAL resume';
108+
disconnect con1;
109+
connection con2;
110+
disconnect con2;
111+
connection default;
112+
ANALYZE TABLE t1;
113+
Table Op Msg_type Msg_text
114+
test.t1 analyze status OK
115+
SELECT CLUST_INDEX_SIZE FROM information_schema.INNODB_SYS_TABLESTATS WHERE NAME = 'test/t1';
116+
CLUST_INDEX_SIZE
117+
1856
118+
SET DEBUG_SYNC = 'RESET';
119+
DROP TABLE t1;

0 commit comments

Comments
 (0)