mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge 10.5 into 10.6
This commit is contained in:
@ -4,13 +4,16 @@
|
||||
--source include/not_embedded.inc
|
||||
--source include/have_debug_sync.inc
|
||||
|
||||
let $wait_condition=select count(*) = 1 from information_schema.processlist;
|
||||
source include/wait_condition.inc;
|
||||
--disable_ps_protocol
|
||||
# Ensure no lingering connections from an earlier test run, which can very
|
||||
# rarely still be visible in SHOW PROCESSLIST here.
|
||||
--let $wait_condition= SELECT COUNT(*) = 1 from information_schema.processlist
|
||||
--source include/wait_condition.inc
|
||||
|
||||
--connect (con1,localhost,root,,)
|
||||
--let $con_id = `SELECT CONNECTION_ID()`
|
||||
|
||||
let $wait_condition=select info is NULL from information_schema.processlist where id != $con_id;
|
||||
let $wait_condition=select command = 'sleep' from information_schema.processlist where id != $con_id;
|
||||
source include/wait_condition.inc;
|
||||
|
||||
--replace_result Execute Query
|
||||
@ -32,9 +35,7 @@ reap;
|
||||
SET DEBUG_SYNC='reset';
|
||||
|
||||
# Wait until default connection has reset query string
|
||||
let $wait_condition=
|
||||
SELECT COUNT(*) = 1 from information_schema.processlist
|
||||
WHERE info is NULL;
|
||||
let $wait_condition=select command = 'sleep' from information_schema.processlist where id != $con_id;
|
||||
--source include/wait_condition.inc
|
||||
|
||||
--replace_result Execute Query
|
||||
|
Reference in New Issue
Block a user