diff options
| author | unknown <evgen@moonbone.local> | 2006-06-16 23:46:37 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-06-16 23:46:37 +0400 |
| commit | ca22a81b1c84ce81e1e9ea2c3ace7be1848027d8 (patch) | |
| tree | a4dc3813e775a6a90fd8e5245fd78f3a51bc7d94 /sql/item_strfunc.cc | |
| parent | 629830d9626472f8deab45e9e9125518b0a2b4d6 (diff) | |
| download | mariadb-git-ca22a81b1c84ce81e1e9ea2c3ace7be1848027d8.tar.gz | |
item_strfunc.cc:
Fix for bug#16716 for --ps-protocol mode.
item_cmpfunc.cc:
Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
for bug#16377. Few language corrections.
sql/item_cmpfunc.cc:
Fix for a memory allocation/freeing problem in agg_cmp_type(). Few language corrections.
sql/item_strfunc.cc:
Fix for bug#16716 for --ps-protocol mode.
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index deb3542f4a5..ee585649f8c 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -274,7 +274,8 @@ String *Item_func_concat::val_str(String *str) if (!(res=args[0]->val_str(str))) goto null; use_as_buff= &tmp_value; - is_const= args[0]->const_item(); + /* Item_subselect in --ps-protocol mode will state it as a non-const */ + is_const= args[0]->const_item() || !args[0]->used_tables(); for (i=1 ; i < arg_count ; i++) { if (res->length() == 0) |