database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Bug #29307: status.test fails with different Table_locks_immediate

Browse Source 
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
This commit is contained in:
unknown
2007-08-18 02:28:08 -06:00
parent 994625d64f
commit 0ece5608fc
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/status.result
View File

@ -16,14 +16,11 @@ unlock tables;
lock tables t1 read; lock tables t1 read;
update t1 set n = 3; update t1 set n = 3;
unlock tables; unlock tables;
show status like 'Table_lock%'; show status like 'Table_locks_waited';
Variable_name Value Variable_name Value
Table_locks_immediate 17
Table_locks_waited 1 Table_locks_waited 1
select * from information_schema.session_status where variable_name like 'Table_lock%'; Immediate
VARIABLE_NAME VARIABLE_VALUE 17
TABLE_LOCKS_IMMEDIATE 18
TABLE_LOCKS_WAITED 1
drop table t1; drop table t1;
select 1; select 1;
1 1

12
mysql-test/t/status.test
View File

@ -49,18 +49,20 @@ update t1 set n = 3;
connection con2; connection con2;
# wait for the other query to start executing # wait for the other query to start executing
let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST where ID = $ID and STATE = "Locked"; 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 # Immediate = 14 + $wait_condition_reps ($wait_timeout is 0, so no extra select
# in addition to the wait condition) # is done inside wait_condition.inc)
--source include/wait_condition.inc --source include/wait_condition.inc
# ++Immediate = 16 + $wait_condition_reps # ++Immediate = 15 + $wait_condition_reps
unlock tables; unlock tables;
connection con1; connection con1;
reap; reap;
# ++Immediate = 17 + $wait_condition_reps # ++Immediate = 16 + $wait_condition_reps
show status like 'Table_locks_waited'; 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'; 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; drop table t1;
disconnect con2; disconnect con2;