database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Post-review fixes (BUG#15658).

Browse Source
This commit is contained in:
pem@mysql.com
2006-01-19 16:13:04 +01:00
parent d894e3043e
commit a07bbd78da
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/sp_head.cc
View File

@@ -387,19 +387,19 @@ sp_name_current_db_new(THD *thd, LEX_STRING name)
}
/*
* Check that the name 'ident' is ok. It's assumed to be an 'ident'
* from the parser, so we only have to check length and trailing spaces.
* The former is a standard requirement (and 'show status' assumes a
* non-empty name), the latter is a mysql:ism as trailing spaces are
* removed by get_field().
*
* RETURN
* TRUE - bad name
* FALSE - name is ok
Check that the name 'ident' is ok. It's assumed to be an 'ident'
from the parser, so we only have to check length and trailing spaces.
The former is a standard requirement (and 'show status' assumes a
non-empty name), the latter is a mysql:ism as trailing spaces are
removed by get_field().
RETURN
TRUE - bad name
FALSE - name is ok
*/
bool
sp_name_check(LEX_STRING ident)
check_routine_name(LEX_STRING ident)
{
return (!ident.str || !ident.str[0] || ident.str[ident.length-1] == ' ');
}

2
sql/sp_head.h
View File

@@ -104,7 +104,7 @@ sp_name *
sp_name_current_db_new(THD *thd, LEX_STRING name);
bool
sp_name_check(LEX_STRING name);
check_routine_name(LEX_STRING name);
class sp_head :private Query_arena
{

4
sql/sql_yacc.yy
View File

@@ -1293,7 +1293,7 @@ sp_name:
my_error(ER_WRONG_DB_NAME, MYF(0), $1.str);
YYABORT;
}
if (sp_name_check($3))
if (check_routine_name($3))
{
my_error(ER_SP_WRONG_NAME, MYF(0), $3.str);
YYABORT;
@@ -1303,7 +1303,7 @@ sp_name:
}
| ident
{
if (sp_name_check($1))
if (check_routine_name($1))
{
my_error(ER_SP_WRONG_NAME, MYF(0), $1.str);
YYABORT;