mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
MDEV-17533 Merge new release of InnoDB 5.6.42 to 10.0
Also, add a test for a bug that does not seem to affect MariaDB.
This commit is contained in:
@ -64,7 +64,6 @@ set DEBUG_SYNC = 'now WAIT_FOR s1';
|
||||
--error ER_DUP_ENTRY
|
||||
update t1 set a=1 where id=2;
|
||||
SET DEBUG_SYNC = 'now SIGNAL s2';
|
||||
disconnect con1;
|
||||
|
||||
--echo /* connection default */
|
||||
connection default;
|
||||
@ -75,5 +74,29 @@ SET DEBUG_SYNC = 'RESET';
|
||||
|
||||
drop table t1;
|
||||
|
||||
--echo #
|
||||
--echo # Bug #27753193 ASSERTION `PREBUILT->TRX->ERROR_KEY_NUM <
|
||||
--echo # HA_ALTER_INFO->KEY_COUNT'
|
||||
|
||||
CREATE TABLE t1 (a INT, UNIQUE KEY(a)) ENGINE=InnoDB;
|
||||
INSERT INTO t1 VALUES (1);
|
||||
|
||||
SET DEBUG_SYNC = 'row_log_table_apply1_before signal S1 WAIT_FOR S2';
|
||||
send ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
|
||||
|
||||
connection con1;
|
||||
SET DEBUG_SYNC = 'now WAIT_FOR S1';
|
||||
--error ER_DUP_ENTRY
|
||||
INSERT INTO t1 VALUES (1);
|
||||
SET DEBUG_SYNC = 'now SIGNAL S2';
|
||||
disconnect con1;
|
||||
|
||||
CONNECTION default;
|
||||
--error ER_DUP_ENTRY
|
||||
reap;
|
||||
SET DEBUG_SYNC='RESET';
|
||||
|
||||
DROP TABLE t1;
|
||||
|
||||
# Wait till all disconnects are completed
|
||||
--source include/wait_until_count_sessions.inc
|
||||
|
Reference in New Issue
Block a user