database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix compiler warnings on some systems. (Unused variables)

Browse Source 
Fixed bug in DROP FUNCTION for UDFs.
Note: It still doesn't work properly, but that bug is somewhere else.


sql/sp.cc:
  Fix compiler warning on some systems. (Unused variable)
sql/sql_parse.cc:
  Fix compiler warning on some systems. (Unused variable)
  Fixed bug in DROP FUNCTION for UDFs.
  Note: It still doesn't work properly, but that bug is somewhere else.
This commit is contained in:
unknown
2004-11-23 19:19:09 +01:00
parent 3afa86dc34
commit ebf164b88e
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sp.cc
View File

@ -1153,7 +1153,6 @@ sp_change_db(THD *thd, char *name, bool no_access_check)
int length, db_length; int length, db_length;
char *dbname=my_strdup((char*) name,MYF(MY_WME)); char *dbname=my_strdup((char*) name,MYF(MY_WME));
char path[FN_REFLEN]; char path[FN_REFLEN];
ulong db_access;
HA_CREATE_INFO create; HA_CREATE_INFO create;
DBUG_ENTER("sp_change_db"); DBUG_ENTER("sp_change_db");
DBUG_PRINT("enter", ("db: %s, no_access_check: %d", name, no_access_check)); DBUG_PRINT("enter", ("db: %s, no_access_check: %d", name, no_access_check));
@ -1174,6 +1173,8 @@ sp_change_db(THD *thd, char *name, bool no_access_check)
#ifndef NO_EMBEDDED_ACCESS_CHECKS #ifndef NO_EMBEDDED_ACCESS_CHECKS
if (! no_access_check) if (! no_access_check)
{ {
ulong db_access;
if (test_all_bits(thd->master_access,DB_ACLS)) if (test_all_bits(thd->master_access,DB_ACLS))
db_access=DB_ACLS; db_access=DB_ACLS;
else else

39
sql/sql_parse.cc
View File

@ -3339,16 +3339,15 @@ create_error:
} }
case SQLCOM_CREATE_FUNCTION: // UDF function case SQLCOM_CREATE_FUNCTION: // UDF function
{ {
sp_head *sph;
if (check_access(thd,INSERT_ACL,"mysql",0,1,0)) if (check_access(thd,INSERT_ACL,"mysql",0,1,0))
break; break;
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
if ((sph= sp_find_function(thd, lex->spname))) if (sp_find_function(thd, lex->spname))
{ {
my_error(ER_UDF_EXISTS, MYF(0), lex->spname->m_name.str); my_error(ER_UDF_EXISTS, MYF(0), lex->spname->m_name.str);
goto error; goto error;
} }
if (!(res = mysql_create_function(thd,&lex->udf))) if (!(res = mysql_create_function(thd, &lex->udf)))
send_ok(thd); send_ok(thd);
#else #else
res= TRUE; res= TRUE;
@ -3800,35 +3799,35 @@ create_error:
else else
sp= sp_find_function(thd, lex->spname); sp= sp_find_function(thd, lex->spname);
mysql_reset_errors(thd); mysql_reset_errors(thd);
if (! sp) if (sp)
result= SP_KEY_NOT_FOUND;
else
{ {
if (check_sp_definer_access(thd, sp)) if (check_sp_definer_access(thd, sp))
goto error; goto error;
if (lex->sql_command == SQLCOM_DROP_PROCEDURE) if (lex->sql_command == SQLCOM_DROP_PROCEDURE)
result= sp_drop_procedure(thd, lex->spname); result= sp_drop_procedure(thd, lex->spname);
else else
{
result= sp_drop_function(thd, lex->spname); result= sp_drop_function(thd, lex->spname);
}
else
{
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
if (result == SP_KEY_NOT_FOUND) if (lex->sql_command == SQLCOM_DROP_FUNCTION)
{ {
udf_func *udf = find_udf(lex->spname->m_name.str, udf_func *udf = find_udf(lex->spname->m_name.str,
lex->spname->m_name.length); lex->spname->m_name.length);
if (udf) if (udf)
{
if (check_access(thd, DELETE_ACL, "mysql", 0, 1, 0))
goto error;
if (!(res = mysql_drop_function(thd, &lex->spname->m_name)))
{ {
if (check_access(thd, DELETE_ACL, "mysql", 0, 1, 0)) send_ok(thd);
goto error; break;
if (!(res = mysql_drop_function(thd,&lex->spname->m_name)))
{
send_ok(thd);
break;
}
} }
} }
#endif
} }
#endif
result= SP_KEY_NOT_FOUND;
} }
res= result; res= result;
switch (result) switch (result)