diff options
author | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2010-06-08 13:50:54 +0200 |
---|---|---|
committer | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2010-06-08 13:50:54 +0200 |
commit | e484e89d3df80e5a67f3eeac71e7c5ec1b081513 (patch) | |
tree | 67d42f9035a4cf560a1c607def98e622af48efad /sql | |
parent | cf2e7c770cbf5405b65fb4e73b76bd3592c3234f (diff) | |
parent | 81e6a982508b45b93b46d5610cd462711fdab98e (diff) | |
download | mariadb-git-e484e89d3df80e5a67f3eeac71e7c5ec1b081513.tar.gz |
automerge
Diffstat (limited to 'sql')
-rw-r--r-- | sql/item_cmpfunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 4eb27988984..506de05f0ea 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1313,8 +1313,8 @@ public: else { args[0]->update_used_tables(); - if ((const_item_cache= !(used_tables_cache= args[0]->used_tables())) && - !with_subselect) + 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(); |