database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for bug#1439 UDF Corruption

Browse Source
This commit is contained in:
gluh@gluh.mysql.r18.ru
2004-03-19 14:35:00 +04:00
parent 698217c8d5
commit e9341da7e7
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/item_func.cc
View File

@ -1489,11 +1489,11 @@ udf_handler::fix_fields(THD *thd, TABLE_LIST *tables, Item_result_field *func,
arg++,i++) arg++,i++)
{ {
if ((*arg)->fix_fields(thd, tables, arg)) if ((*arg)->fix_fields(thd, tables, arg))
return 1; DBUG_RETURN(1);
// we can't assign 'item' before, because fix_fields() can change arg // we can't assign 'item' before, because fix_fields() can change arg
Item *item= *arg; Item *item= *arg;
if (item->check_cols(1)) if (item->check_cols(1))
return 1; DBUG_RETURN(1);
/* /*
TODO: We should think about this. It is not always TODO: We should think about this. It is not always
right way just to set an UDF result to return my_charset_bin right way just to set an UDF result to return my_charset_bin

8
sql/sql_udf.cc
View File

@ -298,7 +298,11 @@ udf_func *find_udf(const char *name,uint length,bool mark_used)
DBUG_ENTER("find_udf"); DBUG_ENTER("find_udf");
/* TODO: This should be changed to reader locks someday! */ /* TODO: This should be changed to reader locks someday! */
rw_rdlock(&THR_LOCK_udf); if (mark_used)
rw_wrlock(&THR_LOCK_udf); /* Called during fix_fields */
else
rw_rdlock(&THR_LOCK_udf); /* Called during parsing */
if ((udf=(udf_func*) hash_search(&udf_hash,(byte*) name, if ((udf=(udf_func*) hash_search(&udf_hash,(byte*) name,
length ? length : (uint) strlen(name)))) length ? length : (uint) strlen(name))))
{ {
@ -474,7 +478,7 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name)
if (!(udf=(udf_func*) hash_search(&udf_hash,(byte*) udf_name->str, if (!(udf=(udf_func*) hash_search(&udf_hash,(byte*) udf_name->str,
(uint) udf_name->length))) (uint) udf_name->length)))
{ {
net_printf(thd, ER_FUNCTION_NOT_DEFINED, udf_name); net_printf(thd, ER_FUNCTION_NOT_DEFINED, udf_name->str);
goto err; goto err;
} }
del_udf(udf); del_udf(udf);