diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-01-21 13:55:26 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-01-21 13:55:26 +0200 |
| commit | 8a3d3a539fa3aa2967c76c3eb59033a13524aeed (patch) | |
| tree | 9e72427611ac5057a8bf3051e0bd43678e33a8a2 /sql/item_strfunc.h | |
| parent | 3ffd7865b02a37569f955e40505f2f6b46cbe7a0 (diff) | |
| download | mariadb-git-8a3d3a539fa3aa2967c76c3eb59033a13524aeed.tar.gz | |
fixed test of cardinality
mysql-test/r/subselect.result:
test of cardinality error
mysql-test/t/subselect.test:
test of cardinality error
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index c56c59bcaef..339a49a3580 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -101,8 +101,8 @@ public: void update_used_tables(); bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) { - return (separator->check_cols(1) || - separator->fix_fields(thd, tlist, &separator) || + return (separator->fix_fields(thd, tlist, &separator) || + separator->check_cols(1) || Item_func::fix_fields(thd, tlist, ref)); } const char *func_name() const { return "concat_ws"; } @@ -382,8 +382,8 @@ public: String *val_str(String *str); bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) { - return (item->check_cols(1) || - item->fix_fields(thd, tlist, &item) || + return (item->fix_fields(thd, tlist, &item) || + item->check_cols(1) || Item_func::fix_fields(thd, tlist, ref)); } void fix_length_and_dec(); @@ -415,8 +415,8 @@ public: String *val_str(String *str); bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) { - return (item->check_cols(1) || - item->fix_fields(thd, tlist, &item) || + return (item->fix_fields(thd, tlist, &item) || + item->check_cols(1) || Item_func::fix_fields(thd, tlist, ref)); } void fix_length_and_dec(); |