From 2e3ded3ec9cd52404e7e9cefc08d0e8d6fbe1324 Mon Sep 17 00:00:00 2001
From: "davi@moksha.local" <>
Date: Wed, 5 Sep 2007 15:03:02 -0300
Subject: [PATCH] The test case for Bug#29936 doesn't work with the embedded
 version, the first query is not running while we are doing wait queries on a
 second connection.

---
 mysql-test/r/sp.result             | 23 -----------
 mysql-test/r/sp_notembedded.result | 23 +++++++++++
 mysql-test/t/sp.test               | 65 ------------------------------
 mysql-test/t/sp_notembedded.test   | 65 ++++++++++++++++++++++++++++++
 4 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 2abff35b232..fd09701c125 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -6546,29 +6546,6 @@ DROP VIEW v1;
 DROP FUNCTION f1;
 DROP FUNCTION f2;
 DROP TABLE t1;
-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;
 
 # Bug#13675.
 
diff --git a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result
index 0b1fa565d28..277eea8570e 100644
--- a/mysql-test/r/sp_notembedded.result
+++ b/mysql-test/r/sp_notembedded.result
@@ -208,3 +208,26 @@ 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.test b/mysql-test/t/sp.test
index 1c8f1ca51c2..27e559f4463 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -7494,71 +7494,6 @@ DROP FUNCTION f1;
 DROP FUNCTION f2;
 DROP TABLE t1;
 
-#
-# 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;
-
 #
 # Bug#13675: DATETIME/DATE type in store proc param seems to be converted as
 # varbinary
diff --git a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test
index 6335ad55606..b5037b469ae 100644
--- a/mysql-test/t/sp_notembedded.test
+++ b/mysql-test/t/sp_notembedded.test
@@ -287,3 +287,68 @@ connection default;
 drop user mysqltest_1@localhost;
 drop procedure 15298_1;
 drop procedure 15298_2;
+
+#
+# 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;