summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2010-06-08 10:28:30 +0400
committerSergey Glukhov <Sergey.Glukhov@sun.com>2010-06-08 10:28:30 +0400
commit81e6a982508b45b93b46d5610cd462711fdab98e (patch)
tree6c967c81b1b67d7d00a52073f2e716ceef8b447f /sql
parente1e3293da56324c3efff25ed79d87ccf6c8fb2d8 (diff)
parent66c621ba3ba8c7c179a8328b06565bdd40296aa5 (diff)
downloadmariadb-git-81e6a982508b45b93b46d5610cd462711fdab98e.tar.gz
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql')
-rw-r--r--sql/item_cmpfunc.h4
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();