1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-17470: Fix the test for --embedded

Browse Source
This commit is contained in:
Marko Mäkelä 2018-12-29 10:57:26 +02:00
parent ed66acb291
commit 68143c8905
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/innodb/r/innodb-alter-debug.result
View File

@ -81,11 +81,8 @@ INSERT INTO t1 SELECT NULL, i FROM t1;
INSERT INTO t1 SELECT NULL, i FROM t1; INSERT INTO t1 SELECT NULL, i FROM t1;
INSERT INTO t1 SELECT NULL, i FROM t1; INSERT INTO t1 SELECT NULL, i FROM t1;
LOCK TABLE t1 READ; LOCK TABLE t1 READ;
SET max_statement_time= 1;
ALTER TABLE t1 FORCE, ALGORITHM=COPY; ALTER TABLE t1 FORCE, ALGORITHM=COPY;
ERROR 70100: Query execution was interrupted (max_statement_time exceeded) kill query @id;
SET DEBUG_SYNC = 'now SIGNAL stop_waining'; ERROR 70100: Query execution was interrupted
SET DEBUG_SYNC = 'now WAIT_FOR stop_waining';
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
SET DEBUG_SYNC = 'RESET';

24
mysql-test/suite/innodb/t/innodb-alter-debug.test
View File

@ -98,9 +98,6 @@ SET DEBUG_SYNC='RESET';
DROP TABLE t1; DROP TABLE t1;
# Wait till all disconnects are completed
--source include/wait_until_count_sessions.inc
--echo # --echo #
--echo # MDEV-17470 Orphan temporary files after interrupted ALTER --echo # MDEV-17470 Orphan temporary files after interrupted ALTER
--echo # cause InnoDB: Operating system error number 17 and eventual --echo # cause InnoDB: Operating system error number 17 and eventual
@ -117,14 +114,21 @@ INSERT INTO t1 SELECT NULL, i FROM t1;
LOCK TABLE t1 READ; LOCK TABLE t1 READ;
--connect (con1,localhost,root,,test) --connect (con1,localhost,root,,test)
SET max_statement_time= 1; let $ID= `SELECT @id := CONNECTION_ID()`;
--error ER_STATEMENT_TIMEOUT send ALTER TABLE t1 FORCE, ALGORITHM=COPY;
ALTER TABLE t1 FORCE, ALGORITHM=COPY;
SET DEBUG_SYNC = 'now SIGNAL stop_waining';
--disconnect con1
--connection default --connection default
SET DEBUG_SYNC = 'now WAIT_FOR stop_waining'; let $wait_condition= select 1 from information_schema.processlist where state='Waiting for table metadata lock';
source include/wait_condition.inc;
let $ignore= `SELECT @id := $ID`;
kill query @id;
--connection con1
--error ER_QUERY_INTERRUPTED
reap;
--disconnect con1
--connection default
UNLOCK TABLES; UNLOCK TABLES;
DROP TABLE t1; DROP TABLE t1;
SET DEBUG_SYNC = 'RESET';
# Wait till all disconnects are completed
--source include/wait_until_count_sessions.inc