From ad6adb1398e08ffa92dd9bce26b04cdf747ff312 Mon Sep 17 00:00:00 2001 From: Jon Olav Hauglid Date: Thu, 14 Jan 2010 14:03:24 +0100 Subject: [PATCH] Partial backport of: revno: 2762 [merge] committer: Matthias Leich branch nick: mysql-6.0-bugteam-push timestamp: Wed 2008-08-13 22:05:34 +0200 message: Upmerge 5.1 -> 6.0 ------------------------------------------------------------ revno: 2497.374.2 committer: Matthias Leich branch nick: mysql-5.1-bugteam-push timestamp: Wed 2008-08-13 21:44:54 +0200 message: Fix for Bug#37853 Test "funcs_1.processlist_val_ps" fails in various ways + corrections of logic in poll routines + minor improvements --- mysql-test/suite/funcs_1/datadict/processlist_val.inc | 10 +++++----- .../suite/funcs_1/r/processlist_val_no_prot.result | 6 +++--- mysql-test/suite/funcs_1/r/processlist_val_ps.result | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mysql-test/suite/funcs_1/datadict/processlist_val.inc b/mysql-test/suite/funcs_1/datadict/processlist_val.inc index c34fb626bcd..8b10cfc5e97 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 = 'Locked'. +# Poll till INFO is no more NULL and State = 'Table Lock'. ; let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST - WHERE INFO IS NOT NULL AND STATE = 'Locked'; + WHERE INFO IS NOT NULL AND STATE = 'Table Lock'; --source include/wait_condition.inc # -# Expect to see the state 'Locked' for the third connection because the SELECT +# Expect to see the state 'Table Lock' for the third connection because the SELECT # collides with the WRITE TABLE LOCK. --replace_column 1 3 6