Commit 9ac1de7a authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug12953
parents 7a57a16a b8920588

mysql-test/r/sp-error.result

+7 −0
Original line number Diff line number Diff line
@@ -758,3 +758,10 @@ execute stmt; 
ERROR 42000: FUNCTION test.bug11834_1 does not exist

deallocate prepare stmt;

drop function bug11834_2;

DROP FUNCTION IF EXISTS bug12953|

CREATE FUNCTION bug12953() RETURNS INT

BEGIN

OPTIMIZE TABLE t1;

RETURN 1;

END|

ERROR 0A000: OPTIMIZE TABLE is not allowed in stored procedures

mysql-test/t/sp-error.test

+15 −2
Original line number Diff line number Diff line
@@ -1085,6 +1085,21 @@ drop function bug11834_1; 
execute stmt;

deallocate prepare stmt;

drop function bug11834_2;



#

# Bug#12953 "Stored procedures: crash if OPTIMIZE TABLE in function"

#

delimiter |;

--disable_warnings

DROP FUNCTION IF EXISTS bug12953|

--enable_warnings

--error ER_SP_BADSTATEMENT

CREATE FUNCTION bug12953() RETURNS INT

BEGIN

  OPTIMIZE TABLE t1;

  RETURN 1;

END|



#

# BUG#NNNN: New bug synopsis

#
@@ -1092,5 +1107,3 @@ drop function bug11834_2; 
#drop procedure if exists bugNNNN|

#--enable_warnings

#create procedure bugNNNN...

sql/sql_yacc.yy

+5 −0
Original line number Diff line number Diff line
@@ -3826,6 +3826,11 @@ optimize: 
	OPTIMIZE opt_no_write_to_binlog table_or_tables

	{

	   LEX *lex=Lex;

	   if (lex->sphead)

	   {

	     my_error(ER_SP_BADSTATEMENT, MYF(0), "OPTIMIZE TABLE");

	     YYABORT;

	   }

	   lex->sql_command = SQLCOM_OPTIMIZE;

           lex->no_write_to_binlog= $2;

	   lex->check_opt.init();