diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result index 277eea8570e..0b1fa565d28 100644 --- a/mysql-test/r/sp_notembedded.result +++ b/mysql-test/r/sp_notembedded.result @@ -208,26 +208,3 @@ GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION drop user mysqltest_1@localhost; drop procedure 15298_1; drop procedure 15298_2; -drop table if exists t1; -drop procedure if exists p1; -create table t1 (value varchar(15)); -create procedure p1() update t1 set value='updated' where value='old'; -call p1(); -insert into t1 (value) values ("old"); -select get_lock('b26162',120); -get_lock('b26162',120) -1 -select 'rl_acquirer', value from t1 where get_lock('b26162',120);; -set session low_priority_updates=on; -call p1();; -select 'rl_contender', value from t1; -rl_contender value -rl_contender old -select release_lock('b26162'); -release_lock('b26162') -1 -rl_acquirer value -rl_acquirer old -drop procedure p1; -drop table t1; -set session low_priority_updates=default; diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test index 4a747b9c614..4e298b2076a 100644 --- a/mysql-test/t/sp_notembedded.test +++ b/mysql-test/t/sp_notembedded.test @@ -268,66 +268,69 @@ drop procedure 15298_1; drop procedure 15298_2; # -# Bug#29936 Stored Procedure DML ignores low_priority_updates setting +# Test case disabled due to Bug#34891: sp_notembedded.test fails sporadically. # - ---disable_warnings -drop table if exists t1; -drop procedure if exists p1; ---enable_warnings - -create table t1 (value varchar(15)); -create procedure p1() update t1 set value='updated' where value='old'; - -# load the procedure into sp cache and execute once -call p1(); - -insert into t1 (value) values ("old"); - -connect (rl_holder, localhost, root,,); -connect (rl_acquirer, localhost, root,,); -connect (rl_contender, localhost, root,,); -connect (rl_wait, localhost, root,,); - -connection rl_holder; -select get_lock('b26162',120); - -connection rl_acquirer; ---send select 'rl_acquirer', value from t1 where get_lock('b26162',120); - -# we must wait till this select opens and locks the tables -connection rl_wait; -let $wait_condition= - select count(*) = 1 from information_schema.processlist - where state = "User lock" and - info = "select 'rl_acquirer', value from t1 where get_lock('b26162',120)"; ---source include/wait_condition.inc - -connection default; -set session low_priority_updates=on; ---send call p1(); - -connection rl_wait; -let $wait_condition= - select count(*) = 1 from information_schema.processlist - where state = "Locked" and - info = "update t1 set value='updated' where value='old'"; ---source include/wait_condition.inc - -connection rl_contender; -select 'rl_contender', value from t1; - -connection rl_holder; -select release_lock('b26162'); - -connection rl_acquirer; ---reap -connection default; ---reap - -disconnect rl_holder; -disconnect rl_acquirer; -disconnect rl_wait; -drop procedure p1; -drop table t1; -set session low_priority_updates=default; +# # +# # Bug#29936 Stored Procedure DML ignores low_priority_updates setting +# # +# +# --disable_warnings +# drop table if exists t1; +# drop procedure if exists p1; +# --enable_warnings +# +# create table t1 (value varchar(15)); +# create procedure p1() update t1 set value='updated' where value='old'; +# +# # load the procedure into sp cache and execute once +# call p1(); +# +# insert into t1 (value) values ("old"); +# +# connect (rl_holder, localhost, root,,); +# connect (rl_acquirer, localhost, root,,); +# connect (rl_contender, localhost, root,,); +# connect (rl_wait, localhost, root,,); +# +# connection rl_holder; +# select get_lock('b26162',120); +# +# connection rl_acquirer; +# --send select 'rl_acquirer', value from t1 where get_lock('b26162',120); +# +# # we must wait till this select opens and locks the tables +# connection rl_wait; +# let $wait_condition= +# select count(*) = 1 from information_schema.processlist +# where state = "User lock" and +# info = "select 'rl_acquirer', value from t1 where get_lock('b26162',120)"; +# --source include/wait_condition.inc +# +# connection default; +# set session low_priority_updates=on; +# --send call p1(); +# +# connection rl_wait; +# let $wait_condition= +# select count(*) = 1 from information_schema.processlist +# where state = "Locked" and +# info = "update t1 set value='updated' where value='old'"; +# --source include/wait_condition.inc +# +# connection rl_contender; +# select 'rl_contender', value from t1; +# +# connection rl_holder; +# select release_lock('b26162'); +# +# connection rl_acquirer; +# --reap +# connection default; +# --reap +# +# disconnect rl_holder; +# disconnect rl_acquirer; +# disconnect rl_wait; +# drop procedure p1; +# drop table t1; +# set session low_priority_updates=default;