summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2004-03-19 14:35:00 +0400
committerunknown <gluh@gluh.mysql.r18.ru>2004-03-19 14:35:00 +0400
commit433c2bf535ff190933d7a7463c56bfef878b3cd2 (patch)
treea81846faa22cac23aaa92ef3aa21497e3f9eb2ff /sql/item_func.cc
parent44452dfa77cb209fe58af3cc2f9c2198006b9ca7 (diff)
downloadmariadb-git-433c2bf535ff190933d7a7463c56bfef878b3cd2.tar.gz
Fix for bug#1439 UDF Corruption
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 04e3452c1f7..f24891dfa6b 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1489,11 +1489,11 @@ udf_handler::fix_fields(THD *thd, TABLE_LIST *tables, Item_result_field *func,
arg++,i++)
{
if ((*arg)->fix_fields(thd, tables, arg))
- return 1;
+ DBUG_RETURN(1);
// we can't assign 'item' before, because fix_fields() can change arg
Item *item= *arg;
if (item->check_cols(1))
- return 1;
+ DBUG_RETURN(1);
/*
TODO: We should think about this. It is not always
right way just to set an UDF result to return my_charset_bin