diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 09:37:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 09:50:24 +0300 |
| commit | 84be33abe010afa07c8cfe24d4c44be5d117ed22 (patch) | |
| tree | 5c295349a5936cadea8d879ad895011215de81ea /mysql-test/suite/innodb/r/innodb-table-online.result | |
| parent | f91eb71e1cfaac56aa1c14b3681dbff3edc7eb0c (diff) | |
| parent | 19d21b9366c1eb5c1c1e822a09969e9a23bfe2c3 (diff) | |
| download | mariadb-git-84be33abe010afa07c8cfe24d4c44be5d117ed22.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb-table-online.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb-table-online.result | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-table-online.result b/mysql-test/suite/innodb/r/innodb-table-online.result index b8cd99659fa..cc4df79c10a 100644 --- a/mysql-test/suite/innodb/r/innodb-table-online.result +++ b/mysql-test/suite/innodb/r/innodb-table-online.result @@ -143,7 +143,8 @@ ROLLBACK; # session con1 KILL QUERY @id; ERROR 70100: Query execution was interrupted -SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR kill_done'; +SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml_done'; +SET DEBUG_SYNC = 'row_log_table_apply2_before SIGNAL applied WAIT_FOR kill_done'; ALTER TABLE t1 ROW_FORMAT=REDUNDANT; # session default SET DEBUG_SYNC = 'now WAIT_FOR rebuilt'; @@ -153,6 +154,10 @@ ddl_background_drop_indexes 0 ddl_background_drop_tables 0 ddl_online_create_index 1 ddl_pending_alter_table 1 +BEGIN; +INSERT INTO t1 VALUES(7,4,2); +ROLLBACK; +SET DEBUG_SYNC = 'now SIGNAL dml_done WAIT_FOR applied'; KILL QUERY @id; SET DEBUG_SYNC = 'now SIGNAL kill_done'; # session con1 @@ -195,6 +200,7 @@ t1 CREATE TABLE `t1` ( `c3` char(255) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT +ALTER TABLE t1 ROW_FORMAT=REDUNDANT; SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt2 WAIT_FOR dml2_done'; SET lock_wait_timeout = 10; ALTER TABLE t1 ROW_FORMAT=COMPACT, ALGORITHM = INPLACE; |