Commit c70aa163 authored by Marko Mäkelä's avatar Marko Mäkelä

fixup test 008815f5

Reduce the test diff from 10.4.
parent 008815f5
...@@ -219,7 +219,7 @@ connection default; ...@@ -219,7 +219,7 @@ connection default;
DELETE FROM t1; DELETE FROM t1;
connection ddl; connection ddl;
SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL copied WAIT_FOR logged'; SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL copied WAIT_FOR logged';
ALTER TABLE t1 FORCE; ALTER TABLE t1 ADD COLUMN b INT NOT NULL DEFAULT 2 AFTER a, FORCE;
disconnect stop_purge; disconnect stop_purge;
connection default; connection default;
SET DEBUG_SYNC = 'now WAIT_FOR copied'; SET DEBUG_SYNC = 'now WAIT_FOR copied';
...@@ -228,12 +228,13 @@ INSERT INTO t1 SET a=1; ...@@ -228,12 +228,13 @@ INSERT INTO t1 SET a=1;
INSERT INTO t1 SET a=2,c=4; INSERT INTO t1 SET a=2,c=4;
SET DEBUG_SYNC = 'now SIGNAL logged'; SET DEBUG_SYNC = 'now SIGNAL logged';
connection ddl; connection ddl;
UPDATE t1 SET b = b + 1 WHERE a = 2;
connection default; connection default;
SET DEBUG_SYNC = RESET; SET DEBUG_SYNC = RESET;
SELECT * FROM t1; SELECT * FROM t1;
a c a b c
1 NULL 1 2 NULL
2 4 2 3 4
# #
# MDEV-15872 Crash in online ALTER TABLE...ADD PRIMARY KEY # MDEV-15872 Crash in online ALTER TABLE...ADD PRIMARY KEY
# after instant ADD COLUMN ... NULL # after instant ADD COLUMN ... NULL
...@@ -255,8 +256,8 @@ disconnect ddl; ...@@ -255,8 +256,8 @@ disconnect ddl;
connection default; connection default;
SET DEBUG_SYNC = RESET; SET DEBUG_SYNC = RESET;
SELECT * FROM t1; SELECT * FROM t1;
a c d a b c d
1 NULL 1 1 2 NULL 1
2 4 1 2 3 4 1
DROP TABLE t1; DROP TABLE t1;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency; SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;
...@@ -248,7 +248,7 @@ DELETE FROM t1; ...@@ -248,7 +248,7 @@ DELETE FROM t1;
connection ddl; connection ddl;
SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL copied WAIT_FOR logged'; SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL copied WAIT_FOR logged';
send ALTER TABLE t1 FORCE; send ALTER TABLE t1 ADD COLUMN b INT NOT NULL DEFAULT 2 AFTER a, FORCE;
disconnect stop_purge; disconnect stop_purge;
...@@ -262,6 +262,7 @@ SET DEBUG_SYNC = 'now SIGNAL logged'; ...@@ -262,6 +262,7 @@ SET DEBUG_SYNC = 'now SIGNAL logged';
connection ddl; connection ddl;
reap; reap;
UPDATE t1 SET b = b + 1 WHERE a = 2;
connection default; connection default;
SET DEBUG_SYNC = RESET; SET DEBUG_SYNC = RESET;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment