diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-06 20:46:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-06 20:46:07 +0100 |
| commit | 18c51eee3557ecc61d69778adb6c78c0fae4d496 (patch) | |
| tree | 969192b1cc276f574271ceef2106f949de4f749b /sql/item_strfunc.h | |
| parent | 68aa3edd1dbedb99efff6ccba6bcb0ddbb6d8fac (diff) | |
| parent | f92cfdb8a9ff7f8287239c39ce4735789a23e3df (diff) | |
| download | mariadb-git-18c51eee3557ecc61d69778adb6c78c0fae4d496.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 8c56cea990b..ad854b02765 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -829,7 +829,7 @@ public: { DBUG_ASSERT(args[0]->fixed); conv_charset= cs; - if (cache_if_const && args[0]->const_item()) + if (cache_if_const && args[0]->const_item() && !args[0]->with_subselect) { uint errors= 0; String tmp, *str= args[0]->val_str(&tmp); |