diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-03-20 13:37:30 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-03-20 13:37:30 +0200 |
| commit | 7699bb4784dd84eb98963fa3abdbc27af0c3169c (patch) | |
| tree | 0a80558837354b86ef292c9d179028a813cb44b9 /sql/item_func.cc | |
| parent | f379d7b172401206de5654f52466601de874cade (diff) | |
| parent | 4bfa7a01227c6fad663094d3f4e9edd4c74a488b (diff) | |
| download | mariadb-git-7699bb4784dd84eb98963fa3abdbc27af0c3169c.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
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
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 |