1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sql_udf.cc:

Browse Source 
Addendum to the fix for bug#15439 : valgrind pb failed


sql/sql_udf.cc:
  Addendum to the fix for bug#15439 : valgrind pb failed
This commit is contained in:
unknown 2007-01-03 18:26:39 +02:00
parent 4c737cf142
commit ea5557aade
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_udf.cc
View File

@ -510,6 +510,8 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name)
TABLE *table; TABLE *table;
TABLE_LIST tables; TABLE_LIST tables;
udf_func *udf; udf_func *udf;
char *exact_name_str;
uint exact_name_len;
DBUG_ENTER("mysql_drop_function"); DBUG_ENTER("mysql_drop_function");
if (!initialized) if (!initialized)
{ {
@ -523,6 +525,8 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name)
my_error(ER_FUNCTION_NOT_DEFINED, MYF(0), udf_name->str); my_error(ER_FUNCTION_NOT_DEFINED, MYF(0), udf_name->str);
goto err; goto err;
} }
exact_name_str= udf->name.str;
exact_name_len= udf->name.length;
del_udf(udf); del_udf(udf);
/* /*
Close the handle if this was function that was found during boot or Close the handle if this was function that was found during boot or
@ -536,7 +540,7 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name)
tables.table_name= tables.alias= (char*) "func"; tables.table_name= tables.alias= (char*) "func";
if (!(table = open_ltable(thd,&tables,TL_WRITE))) if (!(table = open_ltable(thd,&tables,TL_WRITE)))
goto err; goto err;
table->field[0]->store(udf->name.str, udf->name.length, &my_charset_bin); table->field[0]->store(exact_name_str, exact_name_len, &my_charset_bin);
table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS); table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
if (!table->file->index_read_idx(table->record[0], 0, if (!table->file->index_read_idx(table->record[0], 0,
(byte*) table->field[0]->ptr, (byte*) table->field[0]->ptr,