database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge polly.(none):/home/kaa/src/opt/bug32020/my50-bug31445

Browse Source 
into  polly.(none):/home/kaa/src/opt/bug32020/my51-bug31445


mysql-test/r/skip_grants.result:
  Auto merged
mysql-test/t/skip_grants.test:
  Auto merged
sql/sql_udf.cc:
  Auto merged
This commit is contained in:
unknown
2007-11-09 13:31:48 +03:00
parent dc0a59a2e7 737cdfeaeb
commit 0280133ac0
3 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_udf.cc
View File

@ -393,7 +393,12 @@ int mysql_create_function(THD *thd,udf_func *udf)
if (!initialized)
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
if (opt_noacl)
my_error(ER_CANT_INITIALIZE_UDF, MYF(0),
udf->name.str,
"UDFs are unavailable with the --skip-grant-tables option");
else
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
DBUG_RETURN(1);
}
@ -516,7 +521,10 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name)
if (!initialized)
{
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
if (opt_noacl)
my_error(ER_FUNCTION_NOT_DEFINED, MYF(0), udf_name->str);
else
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
DBUG_RETURN(1);
}