Below is the list of changes that have just been committed into a local
5.1 repository of davi. When davi does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-09-05 15:03:02-03:00, davi@stripped +4 -0
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@stripped, 2007-09-05 15:02:59-03:00, davi@stripped +0 -23
Remove test case result for Bug#29936, moving to sp_notembedded.result
mysql-test/r/sp_notembedded.result@stripped, 2007-09-05 15:02:59-03:00, davi@stripped +23 -0
Test case result for Bug#29936, moved from sp.result
mysql-test/t/sp.test@stripped, 2007-09-05 15:02:59-03:00, davi@stripped +0 -65
Remove test case for Bug#29936, moving to sp_notembedded.test
mysql-test/t/sp_notembedded.test@stripped, 2007-09-05 15:02:59-03:00, davi@stripped +65 -0
Test case result for Bug#29936, moved from sp.test
diff -Nrup a/mysql-test/r/sp.result b/mysql-test/r/sp.result
--- a/mysql-test/r/sp.result 2007-09-04 19:49:53 -03:00
+++ b/mysql-test/r/sp.result 2007-09-05 15:02:59 -03:00
@@ -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 -Nrup a/mysql-test/r/sp_notembedded.result b/mysql-test/r/sp_notembedded.result
--- a/mysql-test/r/sp_notembedded.result 2006-10-04 11:33:24 -03:00
+++ b/mysql-test/r/sp_notembedded.result 2007-09-05 15:02:59 -03:00
@@ -208,3 +208,26 @@ GRANT ALL PRIVILEGES ON *.* TO 'root'@'l
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 -Nrup a/mysql-test/t/sp.test b/mysql-test/t/sp.test
--- a/mysql-test/t/sp.test 2007-09-04 19:49:54 -03:00
+++ b/mysql-test/t/sp.test 2007-09-05 15:02:59 -03:00
@@ -7495,71 +7495,6 @@ 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 -Nrup a/mysql-test/t/sp_notembedded.test b/mysql-test/t/sp_notembedded.test
--- a/mysql-test/t/sp_notembedded.test 2006-10-04 11:33:25 -03:00
+++ b/mysql-test/t/sp_notembedded.test 2007-09-05 15:02:59 -03:00
@@ -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;
