diff options
| author | unknown <igor@olga.mysql.com> | 2007-01-09 10:26:28 -0800 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-01-09 10:26:28 -0800 |
| commit | eca431f3f3f8498364239803c150f34569d6c473 (patch) | |
| tree | 3ef44670480dd97c145363fba05d5c1a9d5aa323 /sql/item_cmpfunc.h | |
| parent | 48451b86bd65bec251832e48270446edc3193e1d (diff) | |
| parent | cbd1bd90786025b98b9e510f770c5e3a0f3b23c6 (diff) | |
| download | mariadb-git-eca431f3f3f8498364239803c150f34569d6c473.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25027
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_lex.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 454aed01aff..7bdc90adcee 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1027,7 +1027,8 @@ public: else { args[0]->update_used_tables(); - if ((const_item_cache= !(used_tables_cache= args[0]->used_tables()))) + if ((const_item_cache= !(used_tables_cache= args[0]->used_tables())) && + !with_subselect) { /* Remember if the value is always NULL or never NULL */ cached_value= (longlong) args[0]->is_null(); |