Skip to content

Commit af92914

Browse files
sysprgsysprg
committed
MDEV-28583 postfix: fixing .result files after automatic merge
1 parent 01c0345 commit af92914

File tree

4 files changed

+1066
-450
lines changed

4 files changed

+1066
-450
lines changed

‎mysql-test/suite/galera/r/galera_ist_MDEV-28423,debug.rdiff‎

Lines changed: 138 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
--- r/galera_ist_MDEV-28423.result
22
+++ r/galera_ist_MDEV-28423.reject
3-
@@ -286,3 +286,111 @@
3+
@@ -517,3 +517,187 @@
4+
1
45
DROP TABLE t1;
56
COMMIT;
6-
SET AUTOCOMMIT=ON;
77
+Performing State Transfer on a server that has been killed and restarted
88
+while a DDL was in progress on it
99
+connection node_1;
10-
+CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB;
10+
+CREATE TABLE t1 (id int not null primary key,f1 CHAR(255)) ENGINE=InnoDB;
1111
+SET AUTOCOMMIT=OFF;
1212
+START TRANSACTION;
13-
+INSERT INTO t1 VALUES ('node1_committed_before');
14-
+INSERT INTO t1 VALUES ('node1_committed_before');
15-
+INSERT INTO t1 VALUES ('node1_committed_before');
16-
+INSERT INTO t1 VALUES ('node1_committed_before');
17-
+INSERT INTO t1 VALUES ('node1_committed_before');
13+
+INSERT INTO t1 VALUES (1,'node1_committed_before');
14+
+INSERT INTO t1 VALUES (2,'node1_committed_before');
15+
+INSERT INTO t1 VALUES (3,'node1_committed_before');
16+
+INSERT INTO t1 VALUES (4,'node1_committed_before');
17+
+INSERT INTO t1 VALUES (5,'node1_committed_before');
1818
+connection node_2;
1919
+START TRANSACTION;
20-
+INSERT INTO t1 VALUES ('node2_committed_before');
21-
+INSERT INTO t1 VALUES ('node2_committed_before');
22-
+INSERT INTO t1 VALUES ('node2_committed_before');
23-
+INSERT INTO t1 VALUES ('node2_committed_before');
24-
+INSERT INTO t1 VALUES ('node2_committed_before');
20+
+INSERT INTO t1 VALUES (6,'node2_committed_before');
21+
+INSERT INTO t1 VALUES (7,'node2_committed_before');
22+
+INSERT INTO t1 VALUES (8,'node2_committed_before');
23+
+INSERT INTO t1 VALUES (9,'node2_committed_before');
24+
+INSERT INTO t1 VALUES (10,'node2_committed_before');
2525
+COMMIT;
2626
+SET GLOBAL debug_dbug = 'd,sync.alter_opened_table';
2727
+connection node_1;
@@ -32,83 +32,159 @@
3232
+connection node_1;
3333
+SET AUTOCOMMIT=OFF;
3434
+START TRANSACTION;
35-
+INSERT INTO t1 (f1) VALUES ('node1_committed_during');
36-
+INSERT INTO t1 (f1) VALUES ('node1_committed_during');
37-
+INSERT INTO t1 (f1) VALUES ('node1_committed_during');
38-
+INSERT INTO t1 (f1) VALUES ('node1_committed_during');
39-
+INSERT INTO t1 (f1) VALUES ('node1_committed_during');
35+
+INSERT INTO t1 (id,f1) VALUES (11,'node1_committed_during');
36+
+INSERT INTO t1 (id,f1) VALUES (12,'node1_committed_during');
37+
+INSERT INTO t1 (id,f1) VALUES (13,'node1_committed_during');
38+
+INSERT INTO t1 (id,f1) VALUES (14,'node1_committed_during');
39+
+INSERT INTO t1 (id,f1) VALUES (15,'node1_committed_during');
4040
+COMMIT;
4141
+START TRANSACTION;
42-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
43-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
44-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
45-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
46-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
42+
+INSERT INTO t1 (id,f1) VALUES (16,'node1_to_be_committed_after');
43+
+INSERT INTO t1 (id,f1) VALUES (17,'node1_to_be_committed_after');
44+
+INSERT INTO t1 (id,f1) VALUES (18,'node1_to_be_committed_after');
45+
+INSERT INTO t1 (id,f1) VALUES (19,'node1_to_be_committed_after');
46+
+INSERT INTO t1 (id,f1) VALUES (20,'node1_to_be_committed_after');
4747
+connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1;
4848
+SET AUTOCOMMIT=OFF;
4949
+START TRANSACTION;
50-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
51-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
52-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
53-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
54-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
50+
+INSERT INTO t1 (id,f1) VALUES (21,'node1_to_be_rollbacked_after');
51+
+INSERT INTO t1 (id,f1) VALUES (22,'node1_to_be_rollbacked_after');
52+
+INSERT INTO t1 (id,f1) VALUES (23,'node1_to_be_rollbacked_after');
53+
+INSERT INTO t1 (id,f1) VALUES (24,'node1_to_be_rollbacked_after');
54+
+INSERT INTO t1 (id,f1) VALUES (25,'node1_to_be_rollbacked_after');
5555
+connection node_2;
5656
+Performing --wsrep-recover ...
5757
+connection node_2;
5858
+Starting server ...
5959
+Using --wsrep-start-position when starting mysqld ...
6060
+SET AUTOCOMMIT=OFF;
6161
+START TRANSACTION;
62-
+INSERT INTO t1 (f1) VALUES ('node2_committed_after');
63-
+INSERT INTO t1 (f1) VALUES ('node2_committed_after');
64-
+INSERT INTO t1 (f1) VALUES ('node2_committed_after');
65-
+INSERT INTO t1 (f1) VALUES ('node2_committed_after');
66-
+INSERT INTO t1 (f1) VALUES ('node2_committed_after');
62+
+INSERT INTO t1 (id,f1) VALUES (26,'node2_committed_after');
63+
+INSERT INTO t1 (id,f1) VALUES (27,'node2_committed_after');
64+
+INSERT INTO t1 (id,f1) VALUES (28,'node2_committed_after');
65+
+INSERT INTO t1 (id,f1) VALUES (29,'node2_committed_after');
66+
+INSERT INTO t1 (id,f1) VALUES (30,'node2_committed_after');
6767
+COMMIT;
6868
+connection node_1;
69-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
70-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
71-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
72-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
73-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
69+
+INSERT INTO t1 (id,f1) VALUES (31,'node1_to_be_committed_after');
70+
+INSERT INTO t1 (id,f1) VALUES (32,'node1_to_be_committed_after');
71+
+INSERT INTO t1 (id,f1) VALUES (33,'node1_to_be_committed_after');
72+
+INSERT INTO t1 (id,f1) VALUES (34,'node1_to_be_committed_after');
73+
+INSERT INTO t1 (id,f1) VALUES (35,'node1_to_be_committed_after');
7474
+COMMIT;
7575
+SET AUTOCOMMIT=OFF;
7676
+START TRANSACTION;
77-
+INSERT INTO t1 (f1) VALUES ('node1_committed_after');
78-
+INSERT INTO t1 (f1) VALUES ('node1_committed_after');
79-
+INSERT INTO t1 (f1) VALUES ('node1_committed_after');
80-
+INSERT INTO t1 (f1) VALUES ('node1_committed_after');
81-
+INSERT INTO t1 (f1) VALUES ('node1_committed_after');
77+
+INSERT INTO t1 (id,f1) VALUES (36,'node1_committed_after');
78+
+INSERT INTO t1 (id,f1) VALUES (37,'node1_committed_after');
79+
+INSERT INTO t1 (id,f1) VALUES (38,'node1_committed_after');
80+
+INSERT INTO t1 (id,f1) VALUES (39,'node1_committed_after');
81+
+INSERT INTO t1 (id,f1) VALUES (40,'node1_committed_after');
8282
+COMMIT;
8383
+connection node_1a_galera_st_kill_slave_ddl;
84-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
85-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
86-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
87-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
88-
+INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
84+
+INSERT INTO t1 (id,f1) VALUES (41,'node1_to_be_rollbacked_after');
85+
+INSERT INTO t1 (id,f1) VALUES (42,'node1_to_be_rollbacked_after');
86+
+INSERT INTO t1 (id,f1) VALUES (43,'node1_to_be_rollbacked_after');
87+
+INSERT INTO t1 (id,f1) VALUES (44,'node1_to_be_rollbacked_after');
88+
+INSERT INTO t1 (id,f1) VALUES (45,'node1_to_be_rollbacked_after');
8989
+ROLLBACK;
90-
+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
91-
+COUNT(*) = 2
92-
+1
93-
+SELECT COUNT(*) = 35 FROM t1;
94-
+COUNT(*) = 35
95-
+1
90+
+SET AUTOCOMMIT=ON;
91+
+SET SESSION wsrep_sync_wait=15;
92+
+SELECT COUNT(*) AS EXPECT_3 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
93+
+EXPECT_3
94+
+3
95+
+SELECT COUNT(*) AS EXPECT_35 FROM t1;
96+
+EXPECT_35
97+
+35
98+
+SELECT * FROM t1;
99+
+id f1 f2
100+
+1 node1_committed_before NULL
101+
+2 node1_committed_before NULL
102+
+3 node1_committed_before NULL
103+
+4 node1_committed_before NULL
104+
+5 node1_committed_before NULL
105+
+6 node2_committed_before NULL
106+
+7 node2_committed_before NULL
107+
+8 node2_committed_before NULL
108+
+9 node2_committed_before NULL
109+
+10 node2_committed_before NULL
110+
+11 node1_committed_during NULL
111+
+12 node1_committed_during NULL
112+
+13 node1_committed_during NULL
113+
+14 node1_committed_during NULL
114+
+15 node1_committed_during NULL
115+
+16 node1_to_be_committed_after NULL
116+
+17 node1_to_be_committed_after NULL
117+
+18 node1_to_be_committed_after NULL
118+
+19 node1_to_be_committed_after NULL
119+
+20 node1_to_be_committed_after NULL
120+
+26 node2_committed_after NULL
121+
+27 node2_committed_after NULL
122+
+28 node2_committed_after NULL
123+
+29 node2_committed_after NULL
124+
+30 node2_committed_after NULL
125+
+31 node1_to_be_committed_after NULL
126+
+32 node1_to_be_committed_after NULL
127+
+33 node1_to_be_committed_after NULL
128+
+34 node1_to_be_committed_after NULL
129+
+35 node1_to_be_committed_after NULL
130+
+36 node1_committed_after NULL
131+
+37 node1_committed_after NULL
132+
+38 node1_committed_after NULL
133+
+39 node1_committed_after NULL
134+
+40 node1_committed_after NULL
96135
+SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1;
97136
+COUNT(*) = 0
98137
+1
99138
+COMMIT;
100-
+SET AUTOCOMMIT=ON;
101139
+connection node_1;
102-
+SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
103-
+COUNT(*) = 2
104-
+1
105-
+SELECT COUNT(*) = 35 FROM t1;
106-
+COUNT(*) = 35
107-
+1
140+
+SET AUTOCOMMIT=ON;
141+
+SET SESSION wsrep_sync_wait=15;
142+
+SELECT COUNT(*) AS EXPECT_3 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
143+
+EXPECT_3
144+
+3
145+
+SELECT COUNT(*) AS EXPECT_35 FROM t1;
146+
+EXPECT_35
147+
+35
148+
+SELECT * FROM t1;
149+
+id f1 f2
150+
+1 node1_committed_before NULL
151+
+2 node1_committed_before NULL
152+
+3 node1_committed_before NULL
153+
+4 node1_committed_before NULL
154+
+5 node1_committed_before NULL
155+
+6 node2_committed_before NULL
156+
+7 node2_committed_before NULL
157+
+8 node2_committed_before NULL
158+
+9 node2_committed_before NULL
159+
+10 node2_committed_before NULL
160+
+11 node1_committed_during NULL
161+
+12 node1_committed_during NULL
162+
+13 node1_committed_during NULL
163+
+14 node1_committed_during NULL
164+
+15 node1_committed_during NULL
165+
+16 node1_to_be_committed_after NULL
166+
+17 node1_to_be_committed_after NULL
167+
+18 node1_to_be_committed_after NULL
168+
+19 node1_to_be_committed_after NULL
169+
+20 node1_to_be_committed_after NULL
170+
+26 node2_committed_after NULL
171+
+27 node2_committed_after NULL
172+
+28 node2_committed_after NULL
173+
+29 node2_committed_after NULL
174+
+30 node2_committed_after NULL
175+
+31 node1_to_be_committed_after NULL
176+
+32 node1_to_be_committed_after NULL
177+
+33 node1_to_be_committed_after NULL
178+
+34 node1_to_be_committed_after NULL
179+
+35 node1_to_be_committed_after NULL
180+
+36 node1_committed_after NULL
181+
+37 node1_committed_after NULL
182+
+38 node1_committed_after NULL
183+
+39 node1_committed_after NULL
184+
+40 node1_committed_after NULL
108185
+SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1;
109186
+COUNT(*) = 0
110187
+1
111188
+DROP TABLE t1;
112189
+COMMIT;
113-
+SET AUTOCOMMIT=ON;
114190
+SET GLOBAL debug_dbug = $debug_orig;

0 commit comments

Comments
 (0)