diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-18 02:28:08 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-18 02:28:08 -0600 |
| commit | 0ece5608fc93d761387a0c081a255d06646a691a (patch) | |
| tree | 1ca8add50658a1e53706c307897f1e981e51ec01 | |
| parent | 994625d64fb3c349abc183d0f3a9ac6c8ba7625b (diff) | |
| download | mariadb-git-0ece5608fc93d761387a0c081a255d06646a691a.tar.gz | |
Bug #29307: status.test fails with different Table_locks_immediate
Finish premature patch which was accidentally pushed; remove debugging
info and correct the test.
mysql-test/r/status.result:
Correct test results
mysql-test/t/status.test:
Disable query log for one statement, and correct some comments
| -rw-r--r-- | mysql-test/r/status.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/status.test | 12 |
2 files changed, 10 insertions, 11 deletions
diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result index 8f10625744b..0d49deb7cc8 100644 --- a/mysql-test/r/status.result +++ b/mysql-test/r/status.result @@ -16,14 +16,11 @@ unlock tables; lock tables t1 read; update t1 set n = 3; unlock tables; -show status like 'Table_lock%'; +show status like 'Table_locks_waited'; Variable_name Value -Table_locks_immediate 17 Table_locks_waited 1 -select * from information_schema.session_status where variable_name like 'Table_lock%'; -VARIABLE_NAME VARIABLE_VALUE -TABLE_LOCKS_IMMEDIATE 18 -TABLE_LOCKS_WAITED 1 +Immediate +17 drop table t1; select 1; 1 diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test index 6320f5fb143..cade1d06e38 100644 --- a/mysql-test/t/status.test +++ b/mysql-test/t/status.test @@ -49,18 +49,20 @@ update t1 set n = 3; connection con2; # wait for the other query to start executing let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST where ID = $ID and STATE = "Locked"; -# ++Immediate = 15 + $wait_condition_reps (wait_condition.inc does one select -# in addition to the wait condition) +# Immediate = 14 + $wait_condition_reps ($wait_timeout is 0, so no extra select +# is done inside wait_condition.inc) --source include/wait_condition.inc -# ++Immediate = 16 + $wait_condition_reps +# ++Immediate = 15 + $wait_condition_reps unlock tables; connection con1; reap; -# ++Immediate = 17 + $wait_condition_reps +# ++Immediate = 16 + $wait_condition_reps show status like 'Table_locks_waited'; -# ++Immediate = 18 + $wait_condition_reps +# ++Immediate = 17 + $wait_condition_reps +--disable_query_log eval select variable_value - $wait_condition_reps as Immediate from information_schema.session_status where variable_name like 'Table_locks_immediate'; +--enable_query_log drop table t1; disconnect con2; |