diff options
| author | unknown <sanja@montyprogram.com> | 2012-03-05 15:48:12 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2012-03-05 15:48:12 +0200 |
| commit | 8a5940c4773d3dc7e928e8d9300450a6b5d3b957 (patch) | |
| tree | ff82e59f95a5ffdbca1b7850936651bcbec9eb15 /sql/item_strfunc.h | |
| parent | 6f3c39a0573e7d6777e4288d2ebe5b770733d4ba (diff) | |
| download | mariadb-git-8a5940c4773d3dc7e928e8d9300450a6b5d3b957.tar.gz | |
Fix for LP BUG#944504
Problem is that subquery execution can't be called during prepare/optimize phase.
Also small fix for subquery test suite.
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 c4ce09112bc..fc4e888e6ea 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -747,7 +747,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); |