Bug #29307: status.test fails with different Table_locks_immediate

When using --log --log-output=table, we increment Table_locks_immediate
with every query.  The wait_condition.inc runs a query a variable number
of times, depending on server load, etc.  This is a problem, when the
test is checking the Table_locks_immediate value.

Fix is to adjust the Table_locks_immediate value based on how many times
the wait_condition query was executed.


mysql-test/include/wait_condition.inc:
  Add a $wait_condition_reps variable, which lets the caller check how
  many times the wait_condition query was executed.
  
  This is used in the main.status test to adjust the value of
  Table_locks_immediate (it gets incremented with each query
  when --log --log-output=table).
mysql-test/t/status.test:
  Adjust Table_locks_immediate value based on how many times the
  wait_condition query had to run.

1 files changed, 5 insertions, 0 deletions

diff --git a/mysql-test/include/wait_condition.inc b/mysql-test/include/wait_condition.inc
index 2e6bd276aac..a41d8080c9b 100644
--- a/mysql-test/include/wait_condition.inc
+++ b/mysql-test/include/wait_condition.inc
@@ -17,6 +17,7 @@
 #    let $wait_condition=
 #      SELECT c = 3 FROM t;
 #    --source include/wait_condition.inc
+#    --echo Executed the test condition $wait_condition_reps times
 #
 # EXAMPLE
 #    events_bugs.test, events_time_zone.test
@@ -33,9 +34,13 @@ if ($wait_timeout)
 # calls, and default will be used instead.
 let $wait_timeout= 0;
 
+# Keep track of how many times the wait condition is tested
+# This is used by some tests (e.g., main.status)
+let $wait_condition_reps= 0;
 while ($wait_counter)
 {
     let $success= `$wait_condition`;
+    inc $wait_condition_reps;
     if ($success)
     {
         let $wait_counter= 0;