Commit bd4e8754 authored by davi@mysql.com/endora.local's avatar davi@mysql.com/endora.local
Browse files

Bug#34311 main.lock_multi.test fails 

Re-enable the test case for Bug 30331.
parent a951fb2c

mysql-test/r/lock_multi.result

+10 −0
Original line number Diff line number Diff line
@@ -143,4 +143,14 @@ connection: default 
flush tables;

unlock tables;

drop table t1;

drop table if exists t1,t2;

create table t1 (a int);

flush status;

lock tables t1 read;

insert into t1 values(1);;

unlock tables;

drop table t1;

select @tlwa < @tlwb;

@tlwa < @tlwb

1

End of 5.1 tests

mysql-test/t/lock_multi.test

+27 −32
Original line number Diff line number Diff line
@@ -440,38 +440,33 @@ disconnect flush; 
drop table t1;



#

# Bug#30331: Table_locks_waited shows inaccurate values

#

# This test case was disabled due to Bug#34311: main.lock_multy.test fails.

#

# #

# # Bug#30331: Table_locks_waited shows inaccurate values

# #

#

# --disable_warnings

# drop table if exists t1,t2;

# --enable_warnings

#

# create table t1 (a int);

# flush status;

# lock tables t1 read;

# let $tlwa= `show status like 'Table_locks_waited'`;

# connect (waiter,localhost,root,,);

# connection waiter;

# --send insert into t1 values(1);

# connection default;

# let $wait_condition=

#   select count(*) = 1 from information_schema.processlist

#   where state = "Locked" and info = "insert into t1 values(1)";

# --source include/wait_condition.inc

# let $tlwb= `show status like 'Table_locks_waited'`;

# unlock tables;

# drop table t1;

# disconnect waiter;

# connection default;

# --disable_query_log

# eval SET @tlwa= SUBSTRING_INDEX('$tlwa', '	', -1);

# eval SET @tlwb= SUBSTRING_INDEX('$tlwb', '	', -1);

# --enable_query_log

# select @tlwa < @tlwb;



--disable_warnings

drop table if exists t1,t2;

--enable_warnings

create table t1 (a int);

flush status;

lock tables t1 read;

let $tlwa= `show status like 'Table_locks_waited'`;

connect (waiter,localhost,root,,);

connection waiter;

--send insert into t1 values(1);

connection default;

let $wait_condition=

  select count(*) = 1 from information_schema.processlist

  where state = "Locked" and info = "insert into t1 values(1)";

--source include/wait_condition.inc

let $tlwb= `show status like 'Table_locks_waited'`;

unlock tables;

drop table t1;

disconnect waiter;

connection default;

--disable_query_log

eval SET @tlwa= SUBSTRING_INDEX('$tlwa', '	', -1);

eval SET @tlwb= SUBSTRING_INDEX('$tlwb', '	', -1);

--enable_query_log

select @tlwa < @tlwb;



--echo End of 5.1 tests