database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-17533 Merge new release of InnoDB 5.6.42 to 10.0

Browse Source 
Also, add a test for a bug that does not seem to affect MariaDB.
This commit is contained in:
Marko Mäkelä
2018-10-24 16:28:46 +03:00
parent 2549f98289
commit 30c3d6db32
3 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/suite/innodb/r/innodb-alter-debug.result
View File

@ -54,3 +54,17 @@ SET DEBUG_SYNC = 'now SIGNAL s2';
ERROR 23000: Duplicate entry '1' for key 'uk' ERROR 23000: Duplicate entry '1' for key 'uk'
SET DEBUG_SYNC = 'RESET'; SET DEBUG_SYNC = 'RESET';
drop table t1; drop table t1;
#
# Bug #27753193 ASSERTION `PREBUILT->TRX->ERROR_KEY_NUM <
# 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';
ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
SET DEBUG_SYNC = 'now WAIT_FOR S1';
INSERT INTO t1 VALUES (1);
ERROR 23000: Duplicate entry '1' for key 'a'
SET DEBUG_SYNC = 'now SIGNAL S2';
ERROR 23000: Duplicate entry '1' for key 'a'
SET DEBUG_SYNC='RESET';
DROP TABLE t1;

25
mysql-test/suite/innodb/t/innodb-alter-debug.test
View File

@ -64,7 +64,6 @@ set DEBUG_SYNC = 'now WAIT_FOR s1';
--error ER_DUP_ENTRY --error ER_DUP_ENTRY
update t1 set a=1 where id=2; update t1 set a=1 where id=2;
SET DEBUG_SYNC = 'now SIGNAL s2'; SET DEBUG_SYNC = 'now SIGNAL s2';
disconnect con1;
--echo /* connection default */ --echo /* connection default */
connection default; connection default;
@ -75,5 +74,29 @@ SET DEBUG_SYNC = 'RESET';
drop table t1; 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 # Wait till all disconnects are completed
--source include/wait_until_count_sessions.inc --source include/wait_until_count_sessions.inc

2
storage/innobase/include/univ.i
View File

@ -45,7 +45,7 @@ Created 1/20/1994 Heikki Tuuri
#define INNODB_VERSION_MAJOR 5 #define INNODB_VERSION_MAJOR 5
#define INNODB_VERSION_MINOR 6 #define INNODB_VERSION_MINOR 6
#define INNODB_VERSION_BUGFIX 41 #define INNODB_VERSION_BUGFIX 42
/* The following is the InnoDB version as shown in /* The following is the InnoDB version as shown in
SELECT plugin_version FROM information_schema.plugins; SELECT plugin_version FROM information_schema.plugins;