Commit 2dbcef25 authored by malff@lambda.hsd1.co.comcast.net.'s avatar malff@lambda.hsd1.co.comcast.net.
Browse files

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-8759
parents f8d0d4d9 7da456ca

mysql-test/r/sp-error.result

+12 −0
Original line number Diff line number Diff line
@@ -1638,3 +1638,15 @@ Warning 1287 The syntax 'TYPE=storage_engine' is deprecated and will be removed 
call p1();

call p1();

drop procedure p1;

drop procedure if exists proc_8759;

create procedure proc_8759()

begin

declare should_be_illegal condition for sqlstate '00000';

declare continue handler for should_be_illegal set @x=0;

end$$

ERROR 42000: Bad SQLSTATE: '00000'

create procedure proc_8759()

begin

declare continue handler for sqlstate '00000' set @x=0;

end$$

ERROR 42000: Bad SQLSTATE: '00000'

mysql-test/t/sp-error.test

+26 −0
Original line number Diff line number Diff line
@@ -2386,6 +2386,32 @@ call p1(); 
call p1();

drop procedure p1;



#

# Bug#8759 (Stored Procedures: SQLSTATE '00000' should be illegal)

#



--disable_warnings

drop procedure if exists proc_8759;

--enable_warnings



delimiter $$;



--error ER_SP_BAD_SQLSTATE

create procedure proc_8759()

begin

  declare should_be_illegal condition for sqlstate '00000';

  declare continue handler for should_be_illegal set @x=0;

end$$



--error ER_SP_BAD_SQLSTATE

create procedure proc_8759()

begin

  declare continue handler for sqlstate '00000' set @x=0;

end$$



delimiter ;$$





#

# BUG#NNNN: New bug synopsis

#

sql/sp_pcontext.cc

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ sp_cond_check(LEX_STRING *sqlstate) 
	(c < 'A' || 'Z' < c))

      return FALSE;

  }

  if (strcmp(sqlstate->str, "00000") == 0)

    return FALSE;

  return TRUE;

}