diff options
| author | unknown <monty@mysql.com> | 2004-11-08 01:51:10 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-08 01:51:10 +0200 |
| commit | a23fdf7f741df08e59d9216d24653d7baf299221 (patch) | |
| tree | bbeecf2d734a9725a157b561d18bcc34ab93cf96 /sql/item_func.cc | |
| parent | 70d66da883b1d4bc5a9c22737461aba40023d8ff (diff) | |
| download | mariadb-git-a23fdf7f741df08e59d9216d24653d7baf299221.tar.gz | |
After merge fixes
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 173b1b3fd82..583371aed32 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -193,6 +193,8 @@ bool Item_func::agg_arg_charsets(DTCollation &coll, res= TRUE; break; // we cannot return here, we need to restore "arena". } + if ((*arg)->type() == FIELD_ITEM) + ((Item_field *)(*arg))->no_const_subst= 1; conv->fix_fields(thd, 0, &conv); *arg= conv; } |