mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
cd155be564
------------------------------------------------------------ revno: 3035.4.1 committer: Davi Arnaut <Davi.Arnaut@Sun.COM> branch nick: 39897-6.0 timestamp: Thu 2009-01-15 12:17:57 -0200 message: Bug#39897: lock_multi fails in pushbuild: timeout waiting for processlist The problem is that relying on the "Table lock" thread state in its current position to detect that a thread is waiting on a lock is race prone. The "Table lock" state change happens before the thread actually tries to grab a lock on a table. The solution is to move the "Table lock" state so that its set only when a thread is actually going to wait for a lock. The state change happens after the thread fails to grab the lock (because it is owned by other thread) and proceeds to wait on a condition. This is considered part of work related to WL#4284 "Transactional DDL locking" Warning: this patch contains an incompatible change. When waiting on a lock in thr_lock.c, the server used to display "Locked" processlist state. After this patch, the state is "Table lock". The new state was actually intended to be display since year 2002, when Monty added it. But up until removal of thd->locked boolean member, this state was ignored by SHOW PROCESSLIST code. mysql-test/r/lock_multi.result: A style fix. mysql-test/r/sp-threads.result: Changed output of SHOW PROCESSLIST (new wait state). mysql-test/t/lock_multi.test: Use a more accurate state description when waiting inside thr_lock.c. mysql-test/t/lock_sync.test: Use a more accurate state description when waiting inside thr_lock.c. mysql-test/t/multi_update.test: Use a more accurate state description when waiting inside thr_lock.c. mysql-test/t/query_cache_28249.test: Use a more accurate state description when waiting inside thr_lock.c. mysql-test/t/sp_notembedded.test: Use a more accurate state description when waiting inside thr_lock.c. mysql-test/t/status.test: Use a more accurate state description when waiting inside thr_lock.c. mysys/thr_lock.c: Update thread state while waiting for a table lock. sql/lock.cc: State change was moved inside thr_lock.c.
91 lines
2 KiB
Text
91 lines
2 KiB
Text
use test;
|
|
drop table if exists t1;
|
|
create table t1 (s1 int, s2 int, s3 int);
|
|
create procedure bug4934()
|
|
begin
|
|
insert into t1 values (1,0,1);
|
|
end//
|
|
use test;
|
|
call bug4934();
|
|
select * from t1;
|
|
s1 s2 s3
|
|
1 0 1
|
|
drop table t1;
|
|
create table t1 (s1 int, s2 int, s3 int);
|
|
drop procedure bug4934;
|
|
create procedure bug4934()
|
|
begin
|
|
end//
|
|
select * from t1;
|
|
s1 s2 s3
|
|
call bug4934();
|
|
select * from t1;
|
|
s1 s2 s3
|
|
drop table t1;
|
|
drop procedure bug4934;
|
|
drop procedure if exists bug9486;
|
|
drop table if exists t1, t2;
|
|
create table t1 (id1 int, val int);
|
|
create table t2 (id2 int);
|
|
create procedure bug9486()
|
|
update t1, t2 set val= 1 where id1=id2;
|
|
call bug9486();
|
|
lock tables t2 write;
|
|
call bug9486();
|
|
show processlist;
|
|
Id User Host db Command Time State Info
|
|
# root localhost test Sleep # NULL
|
|
# root localhost test Query # Table lock update t1, t2 set val= 1 where id1=id2
|
|
# root localhost test Query # NULL show processlist
|
|
# root localhost test Sleep # NULL
|
|
unlock tables;
|
|
drop procedure bug9486;
|
|
drop table t1, t2;
|
|
drop procedure if exists bug11158;
|
|
create procedure bug11158() delete t1 from t1, t2 where t1.id = t2.id;
|
|
create table t1 (id int, j int);
|
|
insert into t1 values (1, 1), (2, 2);
|
|
create table t2 (id int);
|
|
insert into t2 values (1);
|
|
call bug11158();
|
|
select * from t1;
|
|
id j
|
|
2 2
|
|
lock tables t2 read;
|
|
call bug11158();
|
|
unlock tables;
|
|
drop procedure bug11158;
|
|
drop table t1, t2;
|
|
drop function if exists bug11554;
|
|
drop view if exists v1;
|
|
create table t1 (i int);
|
|
create function bug11554 () returns int return 1;
|
|
create view v1 as select bug11554() as f;
|
|
insert into t1 (select f from v1);
|
|
drop function bug11554;
|
|
drop table t1;
|
|
drop view v1;
|
|
drop procedure if exists p1;
|
|
drop procedure if exists p2;
|
|
create table t1 (s1 int)|
|
|
create procedure p1() select * from t1|
|
|
create procedure p2()
|
|
begin
|
|
insert into t1 values (1);
|
|
call p1();
|
|
select * from t1;
|
|
end|
|
|
use test;
|
|
lock table t1 write;
|
|
call p2();
|
|
use test;
|
|
drop procedure p1;
|
|
create procedure p1() select * from t1;
|
|
unlock tables;
|
|
s1
|
|
1
|
|
s1
|
|
1
|
|
drop procedure p1;
|
|
drop procedure p2;
|
|
drop table t1;
|