Skip to content

Commit e7e06b3

Browse files
janlindstromsysprg
authored andcommitted
MDEV-35481 : ER_LOCK_DEADLOCK instead of ER_NO_SUCH_TABLE in galera_var_ignore_apply_errors
Add wait_condition before select and set wsrep_sync_wait=0 to avoid possible deadlock. Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
1 parent ff45fda commit e7e06b3

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

mysql-test/suite/galera/r/galera_var_ignore_apply_errors.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ connection node_1;
206206
CREATE TABLE t1 (f1 INTEGER, f2 INTEGER);
207207
DROP TABLE t1;
208208
connection node_2;
209+
set session wsrep_sync_wait=0;
209210
SELECT * FROM t1;
210211
ERROR 42S02: Table 'test.t1' doesn't exist
211212
SET GLOBAL wsrep_ignore_apply_errors = 10;

mysql-test/suite/galera/t/galera_var_ignore_apply_errors.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ CREATE TABLE t1 (f1 INTEGER, f2 INTEGER);
259259
DROP TABLE t1;
260260

261261
--connection node_2
262+
set session wsrep_sync_wait=0;
263+
--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'
264+
--source include/wait_condition.inc
262265
--error ER_NO_SUCH_TABLE
263266
SELECT * FROM t1;
264267
SET GLOBAL wsrep_ignore_apply_errors = 10;

0 commit comments

Comments
 (0)