mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
Bug #29307: status.test fails with different Table_locks_immediate
Finish premature patch which was accidentally pushed; remove debugging info and correct the test.
This commit is contained in:
parent
2ccc363634
commit
76d173fa9d
2 changed files with 10 additions and 11 deletions
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue