bk commit into 5.0 tree (dlenev:1.1969)

[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.1969 05/08/10 10:32:43 dlenev@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/dlenev/src/mysql-5.0-bg12280

  sql/share/errmsg.txt
    1.40 05/08/10 10:32:37 dlenev@stripped +0 -0
    Auto merged

  sql/sql_parse.cc
    1.461 05/08/10 10:32:36 dlenev@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:	dlenev
# Host:	brandersnatch.localdomain
# Root:	/home/dlenev/src/mysql-5.0-bg12280/RESYNC

--- 1.460/sql/sql_parse.cc	2005-08-09 16:29:21 +04:00
+++ 1.461/sql/sql_parse.cc	2005-08-10 10:32:36 +04:00
@@ -6391,6 +6391,13 @@
   bool result=0;
   select_errors=0;				/* Write if more errors */
   bool tmp_write_to_binlog= 1;
+
+  if (thd->in_sub_stmt)
+  {
+    my_error(ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG, MYF(0), "FLUSH");
+    return 1;
+  }
+
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (options & REFRESH_GRANT)
   {

--- 1.39/sql/share/errmsg.txt	2005-08-08 21:12:21 +04:00
+++ 1.40/sql/share/errmsg.txt	2005-08-10 10:32:37 +04:00
@@ -5137,8 +5137,8 @@
 	eng "Failed to ALTER %s %s"
 ER_SP_SUBSELECT_NYI 0A000 
 	eng "Subselect value not supported"
-ER_SP_NO_USE 42000 
-	eng "USE is not allowed in a stored procedure"
+ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG 0A000
+        eng "%s is not allowed in stored function or trigger"
 ER_SP_VARCOND_AFTER_CURSHNDLR 42000 
 	eng "Variable or condition declaration after cursor or handler declaration"
 ER_SP_CURSOR_AFTER_HANDLER 42000