diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-11 20:43:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-11 20:43:48 +0200 |
| commit | a3d80d952d7b99680ca4a3a89e128ecc0d490c10 (patch) | |
| tree | 0d72ee69e037cdd09618ddb53652dd1b220890dc /sql/sp.cc | |
| parent | ec06ba24553d2d83b3a6a6bc4d8150910b01ee7c (diff) | |
| parent | 966661c8cc75dd7d540a5fe40b4d893c40e91d26 (diff) | |
| download | mariadb-git-a3d80d952d7b99680ca4a3a89e128ecc0d490c10.tar.gz | |
merge with 5.1
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index e2e7583b901..ebf2b3c360d 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -719,7 +719,7 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp, { LEX *old_lex= thd->lex, newlex; String defstr; - char saved_cur_db_name_buf[NAME_LEN+1]; + char saved_cur_db_name_buf[SAFE_NAME_LEN+1]; LEX_STRING saved_cur_db_name= { saved_cur_db_name_buf, sizeof(saved_cur_db_name_buf) }; bool cur_db_changed; @@ -1932,7 +1932,7 @@ sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex, Hence, the overrun happens only if the name is in length > 32 and uses multibyte (cyrillic, greek, etc.) */ - char n[NAME_LEN*2+2]; + char n[SAFE_NAME_LEN*2+2]; /* m_qname.str is not always \0 terminated */ memcpy(n, name.m_qname.str, name.m_qname.length); |