Commit cef636d9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/bk/mysql-5.0 

into mysql.com:/home/pem/work/mysql-5.0
parents 03a5cacc 110f6abd

mysql-test/r/sp-error.result

+28 −0
Original line number Diff line number Diff line
@@ -466,4 +466,32 @@ ERROR 70100: Query execution was interrupted 
call bug6807()|

ERROR 70100: Query execution was interrupted

drop procedure bug6807|

drop procedure if exists bug8776_1|

drop procedure if exists bug8776_2|

drop procedure if exists bug8776_3|

drop procedure if exists bug8776_4|

create procedure bug8776_1()

begin

declare continue handler for sqlstate '42S0200test' begin end;

begin end;

end|

ERROR 42000: Bad SQLSTATE: '42S0200test'

create procedure bug8776_2()

begin

declare continue handler for sqlstate '4200' begin end;

begin end;

end|

ERROR 42000: Bad SQLSTATE: '4200'

create procedure bug8776_3()

begin

declare continue handler for sqlstate '420000' begin end;

begin end;

end|

ERROR 42000: Bad SQLSTATE: '420000'

create procedure bug8776_4()

begin

declare continue handler for sqlstate '42x00' begin end;

begin end;

end|

ERROR 42000: Bad SQLSTATE: '42x00'

drop table t1|

mysql-test/t/sp-error.test

+38 −0
Original line number Diff line number Diff line
@@ -641,6 +641,44 @@ call bug6807()| 


drop procedure bug6807|



#

# BUG#876: Stored Procedures: Invalid SQLSTATE is allowed in 

#          a DECLARE ? HANDLER FOR stmt.

#

--disable_warnings

drop procedure if exists bug8776_1|

drop procedure if exists bug8776_2|

drop procedure if exists bug8776_3|

drop procedure if exists bug8776_4|

--enable_warnings

--error ER_SP_BAD_SQLSTATE

create procedure bug8776_1()

begin

  declare continue handler for sqlstate '42S0200test' begin end;

  begin end;

end|



--error ER_SP_BAD_SQLSTATE

create procedure bug8776_2()

begin

  declare continue handler for sqlstate '4200' begin end;

  begin end;

end|



--error ER_SP_BAD_SQLSTATE

create procedure bug8776_3()

begin

  declare continue handler for sqlstate '420000' begin end;

  begin end;

end|



--error ER_SP_BAD_SQLSTATE

create procedure bug8776_4()

begin

  declare continue handler for sqlstate '42x00' begin end;

  begin end;

end|





drop table t1|

sql/share/errmsg.txt

+2 −0
Original line number Diff line number Diff line
@@ -5326,3 +5326,5 @@ ER_PROC_AUTO_REVOKE_FAIL 
	eng "Failed to revoke all privileges to dropped routine"

ER_DATA_TOO_LONG 22001

	eng "Data too long for column '%s' at row %ld"

ER_SP_BAD_SQLSTATE 42000

	eng "Bad SQLSTATE: '%s'"

sql/sp_pcontext.cc

+24 −0
Original line number Diff line number Diff line
@@ -26,6 +26,30 @@ 
#include "sp_pcontext.h"

#include "sp_head.h"



/*

 * Sanity check for SQLSTATEs. Will not check if it's really an existing

 * state (there are just too many), but will check length and bad characters.

 * Returns TRUE if it's ok, FALSE if it's bad.

 */

bool

sp_cond_check(LEX_STRING *sqlstate)

{

  int i;

  const char *p;



  if (sqlstate->length != 5)

    return FALSE;

  for (p= sqlstate->str, i= 0 ; i < 5 ; i++)

  {

    char c = p[i];



    if ((c < '0' || '9' < c) &&

	(c < 'A' || 'Z' < c))

      return FALSE;

  }

  return TRUE;

}



sp_pcontext::sp_pcontext(sp_pcontext *prev)

  : Sql_alloc(), m_psubsize(0), m_csubsize(0), m_hsubsize(0),

    m_handlers(0), m_parent(prev)

sql/sp_pcontext.h

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ typedef struct sp_cond_type 
  uint mysqlerr;

} sp_cond_type_t;



/* Sanity check for SQLSTATEs. Will not check if it's really an existing

 * state (there are just too many), but will check length bad characters.

 */

extern bool

sp_cond_check(LEX_STRING *sqlstate);



typedef struct sp_cond

{

  LEX_STRING name;