next-4284 tree: fix the failures of processlist_val_* tests,

update the condition to wait for in wait_condition
to reflect type-of-operation aware metadata locks.
This commit is contained in:
Konstantin Osipov 2010-02-11 18:19:04 +03:00
parent affdd53394
commit 08df87e473
3 changed files with 8 additions and 12 deletions

View File

@ -367,13 +367,13 @@ echo
; ;
connection default; connection default;
echo echo
# Poll till INFO is no more NULL and State = 'Table Lock'. # Poll till INFO is no more NULL and State = 'Waiting for table'.
; ;
let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE INFO IS NOT NULL AND STATE = 'Table Lock'; WHERE INFO IS NOT NULL AND STATE = 'Waiting for table';
--source include/wait_condition.inc --source include/wait_condition.inc
# #
# Expect to see the state 'Table Lock' for the third connection because the SELECT # Expect to see the state 'Waiting for table' for the third connection because the SELECT
# collides with the WRITE TABLE LOCK. # collides with the WRITE TABLE LOCK.
--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME> --replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST; SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
@ -422,7 +422,7 @@ echo
; ;
connection default; connection default;
echo echo
# Poll till INFO is no more NULL and State = 'Table Lock'. # Poll till INFO is no more NULL and State = 'Waiting for table'.
; ;
let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE INFO IS NOT NULL AND STATE = 'Waiting for table'; WHERE INFO IS NOT NULL AND STATE = 'Waiting for table';

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long