From 08df87e473153bc52db7bb4718f2a82b07d2a572 Mon Sep 17 00:00:00 2001 From: Konstantin Osipov Date: Thu, 11 Feb 2010 18:19:04 +0300 Subject: [PATCH] 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. --- mysql-test/suite/funcs_1/datadict/processlist_val.inc | 8 ++++---- mysql-test/suite/funcs_1/r/processlist_val_no_prot.result | 6 ++---- mysql-test/suite/funcs_1/r/processlist_val_ps.result | 6 ++---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/mysql-test/suite/funcs_1/datadict/processlist_val.inc b/mysql-test/suite/funcs_1/datadict/processlist_val.inc index 6fcaf45c848..9c6bd585fde 100644 --- a/mysql-test/suite/funcs_1/datadict/processlist_val.inc +++ b/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 3 6