Commit 3f7b0f70 authored by unknown's avatar unknown
Browse files

Fixed BUG#9529: Stored Procedures: No Warning on truncation of procedure name 

                during creation.
  Although it returns an error, consistent with the behaviour for other objects.
  (Unclear why we would allow the creation of SPs with truncated names.)


mysql-test/r/sp-error.result:
  New test case for BUG#9529.
mysql-test/t/sp-error.test:
  New test case for BUG#9529.
sql/sp.cc:
  Check SP name length on creation (and drop).
sql/sp.h:
  New status code for bad (too long) name.
sql/sql_parse.cc:
  New status code for bad (too long) name.
parent 190aafb4

mysql-test/r/sp-error.result

+4 −0
Original line number Diff line number Diff line
@@ -654,4 +654,8 @@ flush tables; 
return 5;

end|

ERROR 0A000: FLUSH is not allowed in stored procedures

create procedure bug9529_90123456789012345678901234567890123456789012345678901234567890()

begin

end|

ERROR 42000: Identifier name 'bug9529_90123456789012345678901234567890123456789012345678901234567890' is too long

drop table t1|

mysql-test/t/sp-error.test

+10 −0
Original line number Diff line number Diff line
@@ -920,6 +920,16 @@ begin 
end|





#

# BUG#9529: Stored Procedures: No Warning on truncation of procedure name

#           during creation.

#

--error ER_TOO_LONG_IDENT

create procedure bug9529_90123456789012345678901234567890123456789012345678901234567890()

begin

end|





#

# BUG#NNNN: New bug synopsis

#

sql/sp.cc

+9 −0
Original line number Diff line number Diff line
@@ -120,6 +120,10 @@ db_find_routine_aux(THD *thd, int type, sp_name *name, 
    'db', 'name' and 'type' and the first key is the primary key over the

    same fields.

  */

  if (name->m_name.length > table->field[1]->field_length)

  {

    DBUG_RETURN(SP_KEY_NOT_FOUND);

  }

  table->field[0]->store(name->m_db.str, name->m_db.length, &my_charset_bin);

  table->field[1]->store(name->m_name.str, name->m_name.length,

                         &my_charset_bin);
@@ -389,6 +393,11 @@ db_create_routine(THD *thd, int type, sp_head *sp) 
      ret= SP_GET_FIELD_FAILED;

      goto done;

    }

    if (sp->m_name.length > table->field[MYSQL_PROC_FIELD_NAME]->field_length)

    {

      ret= SP_BAD_IDENTIFIER;

      goto done;

    }

    table->field[MYSQL_PROC_FIELD_DB]->

      store(sp->m_db.str, sp->m_db.length, system_charset_info);

    table->field[MYSQL_PROC_FIELD_NAME]->

sql/sp.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#define SP_PARSE_ERROR       -6

#define SP_INTERNAL_ERROR    -7

#define SP_NO_DB_ERROR       -8

#define SP_BAD_IDENTIFIER    -9



/* Drop all routines in database 'db' */

int

sql/sql_parse.cc

+6 −0
Original line number Diff line number Diff line
@@ -4019,6 +4019,12 @@ mysql_execute_command(THD *thd) 
      delete lex->sphead;

      lex->sphead= 0;

      goto error;

    case SP_BAD_IDENTIFIER:

      my_error(ER_TOO_LONG_IDENT, MYF(0), name);

      lex->unit.cleanup();

      delete lex->sphead;

      lex->sphead= 0;

      goto error;

    default:

      my_error(ER_SP_STORE_FAILED, MYF(0), SP_TYPE_STRING(lex), name);

      lex->unit.cleanup();