diff options
| author | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2020-12-04 13:59:02 +0530 |
|---|---|---|
| committer | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2020-12-04 13:59:02 +0530 |
| commit | 7176e09f8a02ae0a1cc95dcbab66b0156e08ac80 (patch) | |
| tree | 44cc1f09d7de59273031e7a168403b77f0d0e3ac /mysql-test/suite/innodb | |
| parent | 98baf80753943ff08fe502f62e91e50e04f6baf0 (diff) | |
| download | mariadb-git-bb-10.5-MDEV-515.tar.gz | |
MDEV-515 Addressed marko's review comments.bb-10.5-MDEV-515
Diffstat (limited to 'mysql-test/suite/innodb')
| -rw-r--r-- | mysql-test/suite/innodb/disabled.def | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/r/ddl_purge.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb-bug-14084530.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/ddl_purge.test | 4 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-bug-14084530.test | 7 |
5 files changed, 11 insertions, 6 deletions
diff --git a/mysql-test/suite/innodb/disabled.def b/mysql-test/suite/innodb/disabled.def index 89208966015..35c941f8af7 100644 --- a/mysql-test/suite/innodb/disabled.def +++ b/mysql-test/suite/innodb/disabled.def @@ -11,5 +11,3 @@ ############################################################################## create-index-debug : MDEV-13680 InnoDB may crash when btr_page_alloc() fails -innodb.ddl_purge: MDEV-515 -innodb.blob-crash: MDEV-515 diff --git a/mysql-test/suite/innodb/r/ddl_purge.result b/mysql-test/suite/innodb/r/ddl_purge.result index 45f4c99e97b..a1d96de24ca 100644 --- a/mysql-test/suite/innodb/r/ddl_purge.result +++ b/mysql-test/suite/innodb/r/ddl_purge.result @@ -1,5 +1,6 @@ CREATE TABLE t0 (pk INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (pk INT PRIMARY KEY, b INT) ENGINE=InnoDB; +INSERT INTO t0 VALUES(100); connect con1,localhost,root,,test; BEGIN; INSERT INTO t0 SET pk=1; diff --git a/mysql-test/suite/innodb/r/innodb-bug-14084530.result b/mysql-test/suite/innodb/r/innodb-bug-14084530.result index 58cab531e2f..b8e0e3a579d 100644 --- a/mysql-test/suite/innodb/r/innodb-bug-14084530.result +++ b/mysql-test/suite/innodb/r/innodb-bug-14084530.result @@ -1,6 +1,9 @@ SET AUTOCOMMIT = 0; CREATE DATABASE testdb_wl5522; CREATE TABLE testdb_wl5522.t1 (c1 int ) engine = Innodb; +BEGIN; +INSERT INTO testdb_wl5522.t1 VALUES (1),(123),(331); +ROLLBACK; SELECT c1 FROM testdb_wl5522.t1; c1 FLUSH TABLES testdb_wl5522.t1 FOR EXPORT; diff --git a/mysql-test/suite/innodb/t/ddl_purge.test b/mysql-test/suite/innodb/t/ddl_purge.test index 60d17acead8..43a64b2d73c 100644 --- a/mysql-test/suite/innodb/t/ddl_purge.test +++ b/mysql-test/suite/innodb/t/ddl_purge.test @@ -5,6 +5,10 @@ CREATE TABLE t0 (pk INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (pk INT PRIMARY KEY, b INT) ENGINE=InnoDB; +# First insert in the table takes X-lock +# So concurrent DML could be blocked +INSERT INTO t0 VALUES(100); + --connect (con1,localhost,root,,test) BEGIN; INSERT INTO t0 SET pk=1; diff --git a/mysql-test/suite/innodb/t/innodb-bug-14084530.test b/mysql-test/suite/innodb/t/innodb-bug-14084530.test index 0db10678193..f27fbbe31d7 100644 --- a/mysql-test/suite/innodb/t/innodb-bug-14084530.test +++ b/mysql-test/suite/innodb/t/innodb-bug-14084530.test @@ -8,10 +8,9 @@ SET AUTOCOMMIT = 0; CREATE DATABASE testdb_wl5522; CREATE TABLE testdb_wl5522.t1 (c1 int ) engine = Innodb; -# MDEV-515 could reset the clustered index LSN -#BEGIN; -#INSERT INTO testdb_wl5522.t1 VALUES (1),(123),(331); -#ROLLBACK; +BEGIN; +INSERT INTO testdb_wl5522.t1 VALUES (1),(123),(331); +ROLLBACK; SELECT c1 FROM testdb_wl5522.t1; |