diff options
| author | unknown <dlenev@mockturtle.local> | 2006-09-29 10:55:03 +0400 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2006-09-29 10:55:03 +0400 |
| commit | 10c66c6ac7a046ddf363916ee868924be6382a6b (patch) | |
| tree | d8ead16d04f76d57f33c217ab7782d7f850e10f7 /sql/sp.cc | |
| parent | ca48feceee0737619aed37232df3ba8811a8394d (diff) | |
| parent | c316933e602dbd8144e13254bc517f4e108032c3 (diff) | |
| download | mariadb-git-10c66c6ac7a046ddf363916ee868924be6382a6b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
BitKeeper/etc/collapsed:
auto-union
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
mysql-test/r/sp.result:
Manual merge.
mysql-test/t/sp.test:
Manual merge.
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 735b7622512..49dbed79fe5 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -385,16 +385,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, @@ -492,7 +492,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"); |