bk commit into 5.0 tree (dlenev:1.1889) BUG#9566

[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.1889 05/04/07 11:57:47 dlenev@stripped +4 -0
  Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state" to sp-error.test.
  
  According to Per-Erik all SP related tests which should result in error
  should go into sp-error.test and not in sp.test, because we want to be
  able to run sp.test using normal client.

  mysql-test/t/sp.test
    1.101 05/04/07 11:57:43 dlenev@stripped +0 -23
    Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
    state" to sp-error.test.

  mysql-test/t/sp-error.test
    1.62 05/04/07 11:57:43 dlenev@stripped +23 -0
    Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
    state" to sp-error.test.

  mysql-test/r/sp.result
    1.106 05/04/07 11:57:43 dlenev@stripped +0 -10
    Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
    state" to sp-error.test.

  mysql-test/r/sp-error.result
    1.60 05/04/07 11:57:43 dlenev@stripped +10 -0
    Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
    state" to sp-error.test.

# 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-bg9566

--- 1.59/mysql-test/r/sp-error.result	Wed Mar 30 19:43:44 2005
+++ 1.60/mysql-test/r/sp-error.result	Thu Apr  7 11:57:43 2005
@@ -503,4 +503,14 @@
 create procedure bug6600()
 unlock table t1|
 ERROR 0A000: UNLOCK is not allowed in stored procedures
+drop procedure if exists bug9566|
+create procedure bug9566()
+begin
+select * from t1;
+end|
+lock table t1 read|
+call bug9566()|
+ERROR HY000: Table 'proc' was not locked with LOCK TABLES
+unlock tables|
+drop procedure bug9566|
 drop table t1|

--- 1.105/mysql-test/r/sp.result	Thu Apr  7 01:40:25 2005
+++ 1.106/mysql-test/r/sp.result	Thu Apr  7 11:57:43 2005
@@ -2779,14 +2779,4 @@
 3.2000
 drop procedure bug8937|
 delete from t1|
-drop procedure if exists bug9566|
-create procedure bug9566()
-begin
-select * from t1;
-end|
-lock table t1 read|
-call bug9566()|
-ERROR HY000: Table 'proc' was not locked with LOCK TABLES
-unlock tables|
-drop procedure bug9566|
 drop table t1,t2;

--- 1.61/mysql-test/t/sp-error.test	Wed Mar 30 19:43:44 2005
+++ 1.62/mysql-test/t/sp-error.test	Thu Apr  7 11:57:43 2005
@@ -696,6 +696,29 @@
 create procedure bug6600()
   unlock table t1|
 
+#
+# BUG#9566: explicit LOCK TABLE and store procedures result in illegal state
+#
+# We should not think that mysql.proc table does not exist if we are unable
+# to open it under LOCK TABLE or in prelocked mode. Probably this test
+# should be removed when Monty will allow access to mysql.proc without
+# locking it.
+#
+--disable_warnings
+drop procedure if exists bug9566|
+--enable_warnings
+create procedure bug9566()
+begin
+  select * from t1;
+end|
+lock table t1 read|
+# This should fail because we forgot to lock mysql.proc table explicitly
+--error 1100
+call bug9566()|
+unlock tables|
+# This should succeed
+drop procedure bug9566|
+
 
 #
 # BUG#NNNN: New bug synopsis

--- 1.100/mysql-test/t/sp.test	Thu Apr  7 01:40:25 2005
+++ 1.101/mysql-test/t/sp.test	Thu Apr  7 11:57:43 2005
@@ -3397,29 +3397,6 @@
 drop procedure bug8937|
 delete from t1|
 
-#
-# BUG#9566: explicit LOCK TABLE and store procedures result in illegal state
-#
-# We should not think that mysql.proc table does not exist if we are unable
-# to open it under LOCK TABLE or in prelocked mode. Probably this test
-# should be removed when Monty will allow access to mysql.proc without
-# locking it.
-#
---disable_warnings
-drop procedure if exists bug9566|
---enable_warnings
-create procedure bug9566()
-begin
-  select * from t1;
-end|
-lock table t1 read|
-# This should fail because we forgot to lock mysql.proc table explicitly
---error 1100
-call bug9566()|
-unlock tables|
-# This should succeed
-drop procedure bug9566|
-
 
 #
 # BUG#NNNN: New bug synopsis