bk commit into 5.0 tree (pem:1.1926) BUG#8409

[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.1926 05/05/27 16:19:25 pem@stripped +3 -0
  Fixed  BUG#8409: Stored procedure crash if function contains FLUSH
    by simply disabling FLUSH for stored functions. (I can't really work.)

  sql/sql_yacc.yy
    1.383 05/05/27 16:19:20 pem@stripped +5 -0
    Disable FLUSH for stored functions.

  mysql-test/t/sp-error.test
    1.70 05/05/27 16:19:20 pem@stripped +15 -0
    New test case for BUG#8409.

  mysql-test/r/sp-error.result
    1.68 05/05/27 16:19:20 pem@stripped +8 -0
    New test case for BUG#8409.

# 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

--- 1.382/sql/sql_yacc.yy	Thu May 26 18:12:53 2005
+++ 1.383/sql/sql_yacc.yy	Fri May 27 16:19:20 2005
@@ -6511,6 +6511,11 @@
 	FLUSH_SYM opt_no_write_to_binlog
 	{
 	  LEX *lex=Lex;
+	  if (lex->sphead && lex->sphead->m_type == TYPE_ENUM_FUNCTION)
+	  {
+	    my_error(ER_SP_BADSTATEMENT, MYF(0), "FLUSH");
+	    YYABORT;
+	  }
 	  lex->sql_command= SQLCOM_FLUSH; lex->type=0;
           lex->no_write_to_binlog= $2;
 	}

--- 1.67/mysql-test/r/sp-error.result	Fri May 20 17:47:01 2005
+++ 1.68/mysql-test/r/sp-error.result	Fri May 27 16:19:20 2005
@@ -646,4 +646,12 @@
 create procedure bug10537()
 load data local infile '/tmp/somefile' into table t1|
 ERROR 0A000: LOAD DATA is not allowed in stored procedures
+drop function if exists bug8409|
+create function bug8409()
+returns int
+begin
+flush tables;
+return 5;
+end|
+ERROR 0A000: FLUSH is not allowed in stored procedures
 drop table t1|

--- 1.69/mysql-test/t/sp-error.test	Fri May 20 17:47:01 2005
+++ 1.70/mysql-test/t/sp-error.test	Fri May 27 16:19:20 2005
@@ -906,6 +906,21 @@
 
 
 #
+# BUG#8409: Stored procedure crash if function contains FLUSH
+#
+--disable_warnings
+drop function if exists bug8409|
+--enable_warnings
+--error ER_SP_BADSTATEMENT
+create function bug8409()
+  returns int
+begin
+  flush tables;
+  return 5;
+end|
+
+
+#
 # BUG#NNNN: New bug synopsis
 #
 #--disable_warnings