Additional fixes for main.debug_sync failures

Test for MDEV-30364 moved to main.mdl_sync, main.debug_sync is intended
to test debug sync facility itself.

Using ER_LOCK_WAIT_TIMEOUT instead of ER_QUERY_INTERRUPTED allows less
thread synchronization.

Originally fixed by da5cffe.

Author: svoj

mysql-test/main/debug_sync.result

@@ -320,32 +320,3 @@ SHOW VARIABLES LIKE 'DEBUG_SYNC';
 Variable_name	Value
 debug_sync	ON - current signals: 's2,s7,s1,s5'
 SET DEBUG_SYNC= 'RESET';
-#
-# MDEV-30364 Assertion MDL_EXCLUSIVE on DISCARD TABLESPACE in LOCK TABLE mode
-#
-create table t (c int) engine=innodb;
-connect con1,localhost,root;
-set debug_sync='get_schema_column SIGNAL waiting WAIT_FOR go';
-select column_name from information_schema.columns
-where table_schema='test' and table_name='t';
-connection default;
-set debug_sync= 'now WAIT_FOR waiting';
-lock table t write;
-alter table t discard tablespace;
-connect con2,localhost,root;
-kill query $connid;
-disconnect con2;
-connection default;
-ERROR 70100: Query execution was interrupted
-set debug_sync='now SIGNAL go';
-connection con1;
-column_name
-c
-disconnect con1;
-connection default;
-unlock tables;
-drop table t;
-set debug_sync= 'reset';
-#
-# End of 10.6 tests
-#

mysql-test/main/debug_sync.test

@@ -448,42 +448,3 @@ SHOW VARIABLES LIKE 'DEBUG_SYNC';
 # Otherwise signal would confuse the next test.
 #
 SET DEBUG_SYNC= 'RESET';
-
---echo #
---echo # MDEV-30364 Assertion MDL_EXCLUSIVE on DISCARD TABLESPACE in LOCK TABLE mode
---echo #
-create table t (c int) engine=innodb;
---connect con1,localhost,root
-set debug_sync='get_schema_column SIGNAL waiting WAIT_FOR go';
-send select column_name from information_schema.columns
-where table_schema='test' and table_name='t';
-
---connection default
-set debug_sync= 'now WAIT_FOR waiting';
-let $connid=`select connection_id()`;
-lock table t write;
-send alter table t discard tablespace;
-
---connect con2,localhost,root
---let $wait_condition= SELECT COUNT(*)=1 FROM information_schema.processlist WHERE id=$connid AND state='Waiting for table metadata lock' AND INFO='alter table t discard tablespace'
---source include/wait_condition.inc
---evalp kill query $connid
---disconnect con2
-
---connection default
---error ER_QUERY_INTERRUPTED
-reap;
-set debug_sync='now SIGNAL go';
-
---connection con1
-reap;
---disconnect con1
-
---connection default
-unlock tables;
-drop table t;
-set debug_sync= 'reset';
-
---echo #
---echo # End of 10.6 tests
---echo #

mysql-test/main/mdl_sync.result

@@ -3046,3 +3046,23 @@ disconnect con1;
 connection default;
 DROP VIEW v1;
 SET debug_sync='reset';
+#
+# MDEV-30364 Assertion MDL_EXCLUSIVE on DISCARD TABLESPACE in LOCK TABLE mode
+#
+create table t (c int) engine=innodb;
+set debug_sync='get_schema_column SIGNAL waiting WAIT_FOR go';
+select column_name from information_schema.columns
+where table_schema='test' and table_name='t';
+connect con1,localhost,root;
+set debug_sync= 'now WAIT_FOR waiting';
+lock table t write;
+set statement lock_wait_timeout=0 for alter table t discard tablespace;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+unlock tables;
+set debug_sync='now SIGNAL go';
+disconnect con1;
+connection default;
+column_name
+c
+drop table t;
+set debug_sync= 'reset';

mysql-test/main/mdl_sync.test

@@ -4062,6 +4062,29 @@ connection default;
 DROP VIEW v1;
 SET debug_sync='reset';
 
+
+--echo #
+--echo # MDEV-30364 Assertion MDL_EXCLUSIVE on DISCARD TABLESPACE in LOCK TABLE mode
+--echo #
+create table t (c int) engine=innodb;
+set debug_sync='get_schema_column SIGNAL waiting WAIT_FOR go';
+send select column_name from information_schema.columns
+where table_schema='test' and table_name='t';
+
+--connect con1,localhost,root
+set debug_sync= 'now WAIT_FOR waiting';
+lock table t write;
+--error ER_LOCK_WAIT_TIMEOUT
+set statement lock_wait_timeout=0 for alter table t discard tablespace;
+unlock tables;
+set debug_sync='now SIGNAL go';
+--disconnect con1
+
+--connection default
+reap;
+drop table t;
+set debug_sync= 'reset';
+
 # Check that all connections opened by test cases in this file are really
 # gone so execution of other tests won't be affected by their presence.
 --source include/wait_until_count_sessions.inc