bk commit into 5.0 tree (dlenev:1.1939) BUG#9597

[dlenev]

Below is the list of changes that have just been committed into a local
5.0 repository of dlenev. When dlenev 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
  1.1939 05/07/15 13:34:48 dlenev@stripped +2 -0
  Added test case for bug #9565 "Wrong locking in stored procedure if a
  sub-sequent procedure is called" which was fixed by the same patch
  as bug #9597 "read lock stays when querying view from stored procedure".

  mysql-test/t/sp.test
    1.130 05/07/15 13:34:42 dlenev@stripped +22 -0
    Added test case for bug #9565 "Wrong locking in stored procedure if a
    sub-sequent procedure is called".

  mysql-test/r/sp.result
    1.135 05/07/15 13:34:42 dlenev@stripped +17 -0
    Added test case for bug #9565 "Wrong locking in stored procedure if a
    sub-sequent procedure is called".

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dlenev
# Host:	brandersnatch.localdomain
# Root:	/home/dlenev/src/mysql-5.0-bg9565

--- 1.134/mysql-test/r/sp.result	2005-07-11 14:46:33 +04:00
+++ 1.135/mysql-test/r/sp.result	2005-07-15 13:34:42 +04:00
@@ -3062,4 +3062,21 @@
 drop procedure bug6063|
 drop procedure bug7088_1|
 drop procedure bug7088_2|
+drop procedure if exists bug9565_sub|
+drop procedure if exists bug9565|
+create procedure bug9565_sub()
+begin
+select * from t1;
+end|
+create procedure bug9565()
+begin
+insert into t1 values ("one", 1);
+call bug9565_sub();
+end|
+call bug9565()|
+id	data
+one	1
+delete from t1|
+drop procedure bug9565_sub|
+drop procedure bug9565|
 drop table t1,t2;

--- 1.129/mysql-test/t/sp.test	2005-07-11 14:46:33 +04:00
+++ 1.130/mysql-test/t/sp.test	2005-07-15 13:34:42 +04:00
@@ -3832,6 +3832,28 @@
 drop procedure bug7088_1|
 drop procedure bug7088_2|
 
+#
+# BUG#9565: "Wrong locking in stored procedure if a sub-sequent procedure
+#           is called".
+#
+--disable_warnings
+drop procedure if exists bug9565_sub|
+drop procedure if exists bug9565|
+--enable_warnings
+create procedure bug9565_sub()
+begin
+  select * from t1;
+end|
+create procedure bug9565()
+begin
+  insert into t1 values ("one", 1);
+  call bug9565_sub();
+end|
+call bug9565()|
+delete from t1|
+drop procedure bug9565_sub|
+drop procedure bug9565|
+
 
 #
 # BUG#NNNN: New bug synopsis