diff options
| author | bell@sanja.is.com.ua <> | 2002-11-27 19:31:11 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2002-11-27 19:31:11 +0200 |
| commit | 4be2cfd62d077590420e7b4d1ab006ae014738cc (patch) | |
| tree | d1b07dc0628b773032c9602776d3da5f234266e5 /sql/item_strfunc.cc | |
| parent | a3ae370db8df2a10b5414d3c7dd54b69f1029d4b (diff) | |
| parent | 5f2016bb20b3d5036f87d7fb3178894be81f430a (diff) | |
| download | mariadb-git-4be2cfd62d077590420e7b4d1ab006ae014738cc.tar.gz | |
merging
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index fc3b4da8561..7eb7e57a8ca 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2061,7 +2061,7 @@ bool Item_func_conv_charset::fix_fields(THD *thd,struct st_table_list *tables, I if (thd && check_stack_overrun(thd,buff)) return 0; // Fatal error if flag is set! - if (args[0]->fix_fields(thd, tables, args)) + if (args[0]->check_cols(1) || args[0]->fix_fields(thd, tables, args)) return 1; maybe_null=args[0]->maybe_null; const_item_cache=args[0]->const_item(); @@ -2094,7 +2094,7 @@ bool Item_func_set_collation::fix_fields(THD *thd,struct st_table_list *tables, if (thd && check_stack_overrun(thd,buff)) return 0; // Fatal error if flag is set! - if (args[0]->fix_fields(thd, tables, args)) + if (args[0]->check_cols(1) || args[0]->fix_fields(thd, tables, args)) return 1; maybe_null=args[0]->maybe_null; set_charset(set_collation); |