bk commit into 5.0 tree (pem:1.1958)

[pem]

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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.1958 05/09/08 12:56:58 pem@stripped +2 -0
  Merge mysql.com:/usr/local/bk/mysql-5.0
  into  mysql.com:/home/pem/work/mysql-5.0

  mysql-test/t/sp-error.test
    1.87 05/09/08 12:56:49 pem@stripped +0 -0
    Auto merged

  mysql-test/r/sp-error.result
    1.83 05/09/08 12:56:49 pem@stripped +0 -0
    Auto merged

# 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:	pem
# Host:	mysql.comhem.se
# Root:	/home/pem/work/mysql-5.0/RESYNC

--- 1.82/mysql-test/r/sp-error.result	2005-09-07 09:52:57 +02:00
+++ 1.83/mysql-test/r/sp-error.result	2005-09-08 12:56:49 +02:00
@@ -812,3 +812,24 @@
 RETURN 1;
 END|
 ERROR 0A000: OPTIMIZE TABLE is not allowed in stored procedures
+DROP FUNCTION IF EXISTS bug12995|
+CREATE FUNCTION bug12995() RETURNS INT
+BEGIN
+HANDLER t1 OPEN;
+RETURN 1;
+END|
+ERROR 0A000: HANDLER is not allowed in stored procedures
+CREATE FUNCTION bug12995() RETURNS INT
+BEGIN
+HANDLER t1 READ FIRST;
+RETURN 1;
+END|
+ERROR 0A000: HANDLER is not allowed in stored procedures
+CREATE FUNCTION bug12995() RETURNS INT
+BEGIN
+HANDLER t1 CLOSE;
+RETURN 1;
+END|
+ERROR 0A000: HANDLER is not allowed in stored procedures
+SELECT bug12995()|
+ERROR 42000: FUNCTION test.bug12995 does not exist

--- 1.86/mysql-test/t/sp-error.test	2005-09-07 09:52:57 +02:00
+++ 1.87/mysql-test/t/sp-error.test	2005-09-08 12:56:49 +02:00
@@ -1107,6 +1107,36 @@
   OPTIMIZE TABLE t1;
   RETURN 1;
 END|
+delimiter ;|
+
+#
+# Bug##12995 "Inside function "Table 't4' was not locked with LOCK TABLES"
+#
+delimiter |;
+--disable_warnings
+DROP FUNCTION IF EXISTS bug12995|
+--enable_warnings
+--error ER_SP_BADSTATEMENT
+CREATE FUNCTION bug12995() RETURNS INT
+BEGIN
+  HANDLER t1 OPEN;
+  RETURN 1;
+END|
+--error ER_SP_BADSTATEMENT
+CREATE FUNCTION bug12995() RETURNS INT
+BEGIN
+  HANDLER t1 READ FIRST;
+  RETURN 1;
+END|
+--error ER_SP_BADSTATEMENT
+CREATE FUNCTION bug12995() RETURNS INT
+BEGIN
+  HANDLER t1 CLOSE;
+  RETURN 1;
+END|
+--error 1305
+SELECT bug12995()|
+delimiter ;|
 
 #
 # BUG#NNNN: New bug synopsis