Browse Source

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.
pull/374/head
Konstantin Osipov 16 years ago
parent
commit
6cf17332bb
  1. 8
      mysql-test/suite/funcs_1/datadict/processlist_val.inc
  2. 6
      mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
  3. 6
      mysql-test/suite/funcs_1/r/processlist_val_ps.result

8
mysql-test/suite/funcs_1/datadict/processlist_val.inc

@ -367,13 +367,13 @@ echo
;
connection default;
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
WHERE INFO IS NOT NULL AND STATE = 'Table Lock';
WHERE INFO IS NOT NULL AND STATE = 'Waiting for table';
--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.
--replace_column 1 <ID> 3 <HOST_NAME> 6 <TIME>
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
@ -422,7 +422,7 @@ echo
;
connection default;
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
WHERE INFO IS NOT NULL AND STATE = 'Waiting for table';

6
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
File diff suppressed because it is too large
View File

6
mysql-test/suite/funcs_1/r/processlist_val_ps.result
File diff suppressed because it is too large
View File

Loading…
Cancel
Save