1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
|
--source include/have_debug.inc
--source include/have_debug_sync.inc
--source include/have_lowercase0.inc
--source include/have_innodb_16k.inc
--echo # Scenario 1: Bug 33788578 for simple table
--echo # 1.1: Redundant
CREATE TABLE t1_redundant (a TEXT) ENGINE=INNODB, ROW_FORMAT=REDUNDANT;
INSERT INTO t1_redundant (a) VALUES ('foo');
--let $table_name = t1_redundant
--let $pk_col = b
--let $upd_col = b
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578.inc
--echo # 1.2: Compact
CREATE TABLE t1_compact (a TEXT) ENGINE=INNODB, ROW_FORMAT=COMPACT;
INSERT INTO t1_compact (a) VALUES ('foo');
--let $table_name = t1_compact
--let $pk_col = b
--let $upd_col = b
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578.inc
--echo # 1.3: Dynamic
CREATE TABLE t1_dynamic (a TEXT) ENGINE=INNODB, ROW_FORMAT=DYNAMIC;
INSERT INTO t1_dynamic (a) VALUES ('foo');
--let $table_name = t1_dynamic
--let $pk_col = b
--let $upd_col = b
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578.inc
--echo # Scenario 2: Delete scenarios
--echo # 2.1 Redundant
CREATE TABLE t1_redundant (a TEXT) ENGINE=INNODB, ROW_FORMAT=REDUNDANT;
INSERT INTO t1_redundant VALUES ('foo');
ALTER TABLE t1_redundant ADD COLUMN col INT DEFAULT 20, ALGORITHM=INSTANT;
INSERT INTO t1_redundant VALUES ('row2', 22);
--let $table_name = t1_redundant
--let $pk_col = b
--let $del_col = col
--let $del_val = 22
--let $sel_col = a
--let $sel_val = row2
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578_del.inc
--echo # 2.2 Compact
CREATE TABLE t1_compact (a TEXT) ENGINE=INNODB, ROW_FORMAT=COMPACT;
INSERT INTO t1_compact VALUES ('foo');
ALTER TABLE t1_compact ADD COLUMN col INT DEFAULT 20, ALGORITHM=INSTANT;
INSERT INTO t1_compact VALUES ('row2', 22);
--let $table_name = t1_compact
--let $pk_col = b
--let $del_col = col
--let $del_val = 22
--let $sel_col = a
--let $sel_val = row2
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578_del.inc
--echo # 2.3 Dynamic
CREATE TABLE t1_dynamic (a TEXT) ENGINE=INNODB, ROW_FORMAT=DYNAMIC;
INSERT INTO t1_dynamic VALUES ('foo');
ALTER TABLE t1_dynamic ADD COLUMN col INT DEFAULT 20, ALGORITHM=INSTANT;
INSERT INTO t1_dynamic VALUES ('row2', 22);
--let $table_name = t1_dynamic
--let $pk_col = b
--let $del_col = col
--let $del_val = 22
--let $sel_col = a
--let $sel_val = row2
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578_del.inc
--echo # Scenario 2: Upgrade from previous instant algorithm
--echo # Table was created in version 8.0.28 with:
--echo # -----------------------------------------
--echo # DROP DATABASE IF EXISTS test;
--echo # CREATE DATABASE IF NOT EXISTS test;
--echo # USE test;
--echo #
--echo # CREATE TABLE t1_redundant (c1 TEXT) ENGINE=INNODB, ROW_FORMAT=REDUNDANT;
--echo # ALTER TABLE t1_redundant ADD COLUMN c2 INT DEFAULT 0, ALGORITHM=INSTANT;
--echo # INSERT INTO t1_redundant VALUES ("c2", 2);
--echo #
--echo # CREATE TABLE t1_dynamic (c1 TEXT) ENGINE=INNODB, ROW_FORMAT=DYNAMIC;
--echo # ALTER TABLE t1_dynamic ADD COLUMN c2 INT DEFAULT 0, ALGORITHM=INSTANT;
--echo # INSERT INTO t1_dynamic VALUES ("c2", 2);
--echo #
--echo # CREATE TABLE t1_compact (c1 TEXT) ENGINE=INNODB, ROW_FORMAT=COMPACT;
--echo # ALTER TABLE t1_compact ADD COLUMN c2 INT DEFAULT 0, ALGORITHM=INSTANT;
--echo # INSERT INTO t1_compact VALUES ("c2", 2);
--echo #
--echo # CREATE TABLE t2_redundant (c1 TEXT) ENGINE=INNODB, ROW_FORMAT=REDUNDANT;
--echo # ALTER TABLE t2_redundant ADD COLUMN c2 INT DEFAULT 0, ALGORITHM=INSTANT;
--echo # INSERT INTO t2_redundant VALUES ("c2", 2);
--echo #
--echo # CREATE TABLE t2_dynamic (c1 TEXT) ENGINE=INNODB, ROW_FORMAT=DYNAMIC;
--echo # ALTER TABLE t2_dynamic ADD COLUMN c2 INT DEFAULT 0, ALGORITHM=INSTANT;
--echo # INSERT INTO t2_dynamic VALUES ("c2", 2);
--echo #
--echo # CREATE TABLE t2_compact (c1 TEXT) ENGINE=INNODB, ROW_FORMAT=COMPACT;
--echo # ALTER TABLE t2_compact ADD COLUMN c2 INT DEFAULT 0, ALGORITHM=INSTANT;
--echo # INSERT INTO t2_compact VALUES ("c2", 2);
--echo #
--echo # CREATE TABLE t3_redundant (c1 TEXT) ENGINE=INNODB, ROW_FORMAT=REDUNDANT;
--echo # INSERT INTO t3_redundant VALUES ('foo');
--echo # ALTER TABLE t3_redundant ADD COLUMN c2 INT DEFAULT 20, ALGORITHM=INSTANT;
--echo # INSERT INTO t3_redundant VALUES ('row2', 22);
--echo #
--echo # CREATE TABLE t3_dynamic (c1 TEXT) ENGINE=INNODB, ROW_FORMAT=DYNAMIC;
--echo # INSERT INTO t3_dynamic VALUES ('foo');
--echo # ALTER TABLE t3_dynamic ADD COLUMN c2 INT DEFAULT 20, ALGORITHM=INSTANT;
--echo # INSERT INTO t3_dynamic VALUES ('row2', 22);
--echo #
--echo # CREATE TABLE t3_compact (c1 TEXT) ENGINE=INNODB, ROW_FORMAT=COMPACT;
--echo # INSERT INTO t3_compact VALUES ('foo');
--echo # ALTER TABLE t3_compact ADD COLUMN c2 INT DEFAULT 20, ALGORITHM=INSTANT;
--echo # INSERT INTO t3_compact VALUES ('row2', 22);
--echo #
--echo # CREATE TABLE t4_redundant (c1 text, c2 int default 20, c3 int not null) ROW_FORMAT=REDUNDANT, ENGINE=INNODB;
--echo # ALTER TABLE t4_redundant ADD COLUMN c4 INT NOT NULL DEFAULT 40, ALGORITHM=INSTANT;
--echo # INSERT INTO t4_redundant VALUES ("row1", 2, 3, 4);
--echo # INSERT INTO t4_redundant (c1, c3) VALUES ("row2", 33);
--echo # INSERT INTO t4_redundant VALUES ("row3", 222, 333, 444);
--echo # -----------------------------------------
--echo # Replace data directory for upgrade
--source include/shutdown_mysqld.inc
--copy_file $MYSQLTEST_VARDIR/std_data/instant_ddl/bug33788578.zip $MYSQL_TMP_DIR/bug33788578.zip
--file_exists $MYSQL_TMP_DIR/bug33788578.zip
--exec unzip -qo $MYSQL_TMP_DIR/bug33788578.zip -d $MYSQL_TMP_DIR
let $DATADIR = $MYSQL_TMP_DIR/data;
--echo # Restart the server
--replace_result $DATADIR DATADIR
--let $restart_parameters = restart: --datadir=$DATADIR
--let $wait_counter=3000
--source include/start_mysqld.inc
SHOW TABLES;
--echo # Upgrade Scenario 1: Bug 33788578 for upgraded table
--echo # 1.1 Dynamic
--let $table_name = t1_dynamic
--let $pk_col = b
--let $upd_col = b
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578.inc
--echo # 1.2 Compact
--let $table_name = t1_compact
--let $pk_col = b
--let $upd_col = b
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578.inc
--echo # 1.3 Redundant
--let $table_name = t1_redundant
--let $pk_col = b
--let $upd_col = b
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578.inc
--echo # Upgrade Scenario 2: set primary key as previous instant added
--echo # 2.1 Dynamic
--let $table_name = t2_dynamic
--let $pk_col = b
--let $upd_col = c2
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578.inc
--echo # 2.2 Compact
--let $table_name = t2_compact
--let $pk_col = b
--let $upd_col = c2
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578.inc
--echo # 2.3 Redundant
--let $table_name = t2_redundant
--let $pk_col = b
--let $upd_col = c2
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578.inc
--echo # Upgrade scenario 3: delete during online DDL
--echo # 3.1 Dynamic
--let $table_name = t3_dynamic
--let $pk_col = b
--let $del_col = c2
--let $del_val = 22
--let $sel_col = c1
--let $sel_val = row2
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578_del.inc
--echo # 3.2 Compact
--let $table_name = t3_compact
--let $pk_col = b
--let $del_col = c2
--let $del_val = 22
--let $sel_col = c1
--let $sel_val = row2
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578_del.inc
--echo # 3.3 Redundant
--let $table_name = t3_redundant
--let $pk_col = b
--let $del_col = c2
--let $del_val = 22
--let $sel_col = c1
--let $sel_val = row2
--eval ALTER TABLE $table_name ADD COLUMN $pk_col INT DEFAULT 0, ALGORITHM=INSTANT;
--source suite/innodb/include/bug33788578_del.inc
--echo # Redundant related scenarios
--echo # 1. index->table->has_row_versions() is false
SELECT * FROM t4_redundant;
SHOW CREATE TABLE t4_redundant;
CHECK TABLE t4_redundant;
connect (con1,localhost,root,,);
connection con1;
SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL update_now WAIT_FOR update_done';
send;
ALTER TABLE t4_redundant ADD PRIMARY KEY (c3);
connection default;
SET DEBUG_SYNC='now WAIT_FOR update_now';
SELECT * FROM t4_redundant;
SHOW CREATE TABLE t4_redundant;
CHECK TABLE t4_redundant;
UPDATE t4_redundant SET c2 = 2222;
SELECT * FROM t4_redundant;
SHOW CREATE TABLE t4_redundant;
CHECK TABLE t4_redundant;
SET DEBUG_SYNC='now SIGNAL update_done';
connection con1;
reap;
connection default;
disconnect con1;
SELECT * FROM t4_redundant;
SHOW CREATE TABLE t4_redundant;
CHECK TABLE t4_redundant;
DROP TABLE t4_redundant;
--echo # 2. index->table->has_row_versions() is true and rec_new_temp_is_versioned(rec) is false
CREATE TABLE t5_redundant (c1 TEXT, c2 INT DEFAULT 20, c3 INT NOT NULL) ROW_FORMAT=REDUNDANT, ENGINE=INNODB;
INSERT INTO t5_redundant VALUES ("row1", 2, 3);
INSERT INTO t5_redundant (c1, c3) VALUES ("row2", 33);
ALTER TABLE t5_redundant ADD COLUMN c4 INT NOT NULL DEFAULT 40, ALGORITHM=INSTANT;
SELECT * FROM t5_redundant;
SHOW CREATE TABLE t5_redundant;
CHECK TABLE t5_redundant;
connect (con1,localhost,root,,);
connection con1;
SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL update_now WAIT_FOR update_done';
send;
ALTER TABLE t5_redundant ADD PRIMARY KEY (c3);
connection default;
SET DEBUG_SYNC='now WAIT_FOR update_now';
SELECT * FROM t5_redundant;
SHOW CREATE TABLE t5_redundant;
CHECK TABLE t5_redundant;
UPDATE t5_redundant SET c2 = 2222;
SELECT * FROM t5_redundant;
SHOW CREATE TABLE t5_redundant;
CHECK TABLE t5_redundant;
SET DEBUG_SYNC='now SIGNAL update_done';
connection con1;
reap;
connection default;
disconnect con1;
SELECT * FROM t5_redundant;
SHOW CREATE TABLE t5_redundant;
CHECK TABLE t5_redundant;
DROP TABLE t5_redundant;
--echo # 3. index->table->has_row_versions() is true and rec_new_temp_is_versioned(rec) is true
CREATE TABLE t6_redundant (c1 TEXT, c2 INT DEFAULT 20, c3 INT NOT NULL) ROW_FORMAT=REDUNDANT, ENGINE=INNODB;
ALTER TABLE t6_redundant ADD COLUMN c4 INT NOT NULL DEFAULT 40, ALGORITHM=INSTANT;
INSERT INTO t6_redundant VALUES ("row1", 2, 3, 4);
INSERT INTO t6_redundant (c1, c3) VALUES ("row2", 33);
SELECT * FROM t6_redundant;
SHOW CREATE TABLE t6_redundant;
CHECK TABLE t6_redundant;
connect (con1,localhost,root,,);
connection con1;
SET DEBUG_SYNC='innodb_inplace_alter_table_enter SIGNAL update_now WAIT_FOR update_done';
send;
ALTER TABLE t6_redundant ADD PRIMARY KEY (c3);
connection default;
SET DEBUG_SYNC='now WAIT_FOR update_now';
SELECT * FROM t6_redundant;
SHOW CREATE TABLE t6_redundant;
CHECK TABLE t6_redundant;
UPDATE t6_redundant SET c2 = 2222;
SELECT * FROM t6_redundant;
SHOW CREATE TABLE t6_redundant;
CHECK TABLE t6_redundant;
SET DEBUG_SYNC='now SIGNAL update_done';
connection con1;
reap;
connection default;
disconnect con1;
SELECT * FROM t6_redundant;
SHOW CREATE TABLE t6_redundant;
CHECK TABLE t6_redundant;
DROP TABLE t6_redundant;
--echo # Cleanup
--echo # Shutdown server
--source include/shutdown_mysqld.inc
--echo # Remove temp files used
--file_exists $MYSQL_TMP_DIR/bug33788578.zip
--force-rmdir $MYSQL_TMP_DIR/data
--remove_file $MYSQL_TMP_DIR/bug33788578.zip
--echo # Restart server to restore server state
let $restart_parameters =;
--source include/start_mysqld.inc
--echo # End
|
