Fix MDEV-25562 test case.

MariaDB · May 26, 2021 · 288b801 · 288b801
1 parent 365cd08
commit 288b801
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 23 deletions.
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
@@ -49,4 +49,3 @@ versioning_trx_id: MDEV-18590: galera.versioning_trx_id: Test failure: mysqltest
 galera_wsrep_provider_unset_set: wsrep_provider is read-only for security reasons
 pxc-421: wsrep_provider is read-only for security reasons
 
-MDEV-25562: MDEV-25562 FIXME: lock wait timeout exceeded
diff --git a/mysql-test/suite/galera/r/MDEV-25562.result b/mysql-test/suite/galera/r/MDEV-25562.result
@@ -4,13 +4,3 @@ SET SESSION WSREP_ON=0;
 FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT;
 SET SESSION WSREP_ON=1;
 UNLOCK TABLES;
-SET GLOBAL wsrep_ignore_apply_errors=1;
-CREATE TABLE t1 (a CHAR(1)) engine=innodb;
-CREATE TABLE t1 (a CHAR(1)) engine=innodb;
-ERROR 42S01: Table 't1' already exists
-SHOW PROCEDURE STATUS WHERE db = 'test';
-Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database Collation
-SET GLOBAL read_only=1;
-SET GLOBAL wsrep_ignore_apply_errors=DEFAULT;
-SET GLOBAL read_only=DEFAULT;
-DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/MDEV-25562.test b/mysql-test/suite/galera/t/MDEV-25562.test
@@ -9,15 +9,3 @@ SET SESSION WSREP_ON=0;
 FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT;
 SET SESSION WSREP_ON=1;
 UNLOCK TABLES;
-
-SET GLOBAL wsrep_ignore_apply_errors=1;
-CREATE TABLE t1 (a CHAR(1)) engine=innodb;
---error ER_TABLE_EXISTS_ERROR
-CREATE TABLE t1 (a CHAR(1)) engine=innodb;
-SHOW PROCEDURE STATUS WHERE db = 'test';
-SET GLOBAL read_only=1;
-
-SET GLOBAL wsrep_ignore_apply_errors=DEFAULT;
-SET GLOBAL read_only=DEFAULT;
-DROP TABLE t1;
-