diff options
| author | bell@sanja.is.com.ua <> | 2004-03-20 13:37:30 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-03-20 13:37:30 +0200 |
| commit | b7efa3e5f6f73f883ade170fdc5f9e823408e162 (patch) | |
| tree | 0a80558837354b86ef292c9d179028a813cb44b9 /sql/item_func.cc | |
| parent | d095d4753ea2dad809f9e9d0195e46e8e87fd433 (diff) | |
| parent | ce3a82f45d76855367b0fa2ef2318def812a72d7 (diff) | |
| download | mariadb-git-b7efa3e5f6f73f883ade170fdc5f9e823408e162.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 8b516a56b2b..5151fb2876d 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1545,11 +1545,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 |