1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

merge with 5.1

This commit is contained in:
Sergei Golubchik
2010-09-11 20:43:48 +02:00
448 changed files with 9732 additions and 3460 deletions

View File

@@ -215,7 +215,7 @@ void udf_init()
}
tmp->dlhandle = dl;
{
char buf[NAME_LEN+16], *missing;
char buf[SAFE_NAME_LEN+16], *missing;
if ((missing= init_syms(tmp, buf)))
{
sql_print_error(ER(ER_CANT_FIND_DL_ENTRY), missing);
@@ -469,7 +469,7 @@ int mysql_create_function(THD *thd,udf_func *udf)
}
udf->dlhandle=dl;
{
char buf[NAME_LEN+16], *missing;
char buf[SAFE_NAME_LEN+16], *missing;
if ((missing= init_syms(udf, buf)))
{
my_error(ER_CANT_FIND_DL_ENTRY, MYF(0), missing);