Skip to content

Commit 288b801

Browse files
author
Jan Lindström
committed
Fix MDEV-25562 test case.
1 parent 365cd08 commit 288b801

File tree

3 files changed

+0
-23
lines changed

3 files changed

+0
-23
lines changed

mysql-test/suite/galera/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,3 @@ versioning_trx_id: MDEV-18590: galera.versioning_trx_id: Test failure: mysqltest
4949
galera_wsrep_provider_unset_set: wsrep_provider is read-only for security reasons
5050
pxc-421: wsrep_provider is read-only for security reasons
5151

52-
MDEV-25562: MDEV-25562 FIXME: lock wait timeout exceeded

mysql-test/suite/galera/r/MDEV-25562.result

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,3 @@ SET SESSION WSREP_ON=0;
44
FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT;
55
SET SESSION WSREP_ON=1;
66
UNLOCK TABLES;
7-
SET GLOBAL wsrep_ignore_apply_errors=1;
8-
CREATE TABLE t1 (a CHAR(1)) engine=innodb;
9-
CREATE TABLE t1 (a CHAR(1)) engine=innodb;
10-
ERROR 42S01: Table 't1' already exists
11-
SHOW PROCEDURE STATUS WHERE db = 'test';
12-
Db Name Type Definer Modified Created Security_type Comment character_set_client collation_connection Database Collation
13-
SET GLOBAL read_only=1;
14-
SET GLOBAL wsrep_ignore_apply_errors=DEFAULT;
15-
SET GLOBAL read_only=DEFAULT;
16-
DROP TABLE t1;

mysql-test/suite/galera/t/MDEV-25562.test

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,3 @@ SET SESSION WSREP_ON=0;
99
FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT;
1010
SET SESSION WSREP_ON=1;
1111
UNLOCK TABLES;
12-
13-
SET GLOBAL wsrep_ignore_apply_errors=1;
14-
CREATE TABLE t1 (a CHAR(1)) engine=innodb;
15-
--error ER_TABLE_EXISTS_ERROR
16-
CREATE TABLE t1 (a CHAR(1)) engine=innodb;
17-
SHOW PROCEDURE STATUS WHERE db = 'test';
18-
SET GLOBAL read_only=1;
19-
20-
SET GLOBAL wsrep_ignore_apply_errors=DEFAULT;
21-
SET GLOBAL read_only=DEFAULT;
22-
DROP TABLE t1;
23-

0 commit comments

Comments
 (0)