summaryrefslogtreecommitdiff
path: root/sql/sp.cc
diff options
context:
space:
mode:
authorunknown <gluh@mysql.com/gluh.(none)>2006-09-27 19:21:29 +0500
committerunknown <gluh@mysql.com/gluh.(none)>2006-09-27 19:21:29 +0500
commitc1e264a5f5bad4b3da20290ca35bc10babe9e96c (patch)
treea10fd0d14e5103a2c38d8a910d3f93b233f73ccb /sql/sp.cc
parent6d77ba47e5a7dfc54b02635a3133c5b617aaec72 (diff)
downloadmariadb-git-c1e264a5f5bad4b3da20290ca35bc10babe9e96c.tar.gz
after merge fix
Diffstat (limited to 'sql/sp.cc')
-rw-r--r--sql/sp.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sp.cc b/sql/sp.cc
index 63175b110fa..fc72822c15e 100644
--- a/sql/sp.cc
+++ b/sql/sp.cc
@@ -404,16 +404,16 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
{
LEX *old_lex= thd->lex, newlex;
String defstr;
- char old_db_buf[NAME_BYTE_LEN+1];
+ char old_db_buf[NAME_LEN+1];
LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) };
bool dbchanged;
ulong old_sql_mode= thd->variables.sql_mode;
ha_rows old_select_limit= thd->variables.select_limit;
sp_rcontext *old_spcont= thd->spcont;
- char definer_user_name_holder[USERNAME_BYTE_LENGTH + 1];
+ char definer_user_name_holder[USERNAME_LENGTH + 1];
LEX_STRING_WITH_INIT definer_user_name(definer_user_name_holder,
- USERNAME_BYTE_LENGTH);
+ USERNAME_LENGTH);
char definer_host_name_holder[HOSTNAME_LENGTH + 1];
LEX_STRING_WITH_INIT definer_host_name(definer_host_name_holder,
@@ -511,7 +511,7 @@ db_create_routine(THD *thd, int type, sp_head *sp)
int ret;
TABLE *table;
char definer[USER_HOST_BUFF_SIZE];
- char old_db_buf[NAME_BYTE_LEN+1];
+ char old_db_buf[NAME_LEN+1];
LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) };
bool dbchanged;
DBUG_ENTER("db_create_routine");