summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.h
diff options
context:
space:
mode:
authorgluh@mysql.com/eagle.(none) <>2007-02-08 14:54:49 +0400
committergluh@mysql.com/eagle.(none) <>2007-02-08 14:54:49 +0400
commitda9f2149dea1c20c5dc52d0de5bcd0ff19c99fc1 (patch)
treecaeaaa23199a38aa70bcbaa0aa061bd124b8916f /sql/item_cmpfunc.h
parent097c8431e2d1b1b65701678e481f007ad911e60b (diff)
parent60ac1f1b785ced5c8e09d738da294a614e680188 (diff)
downloadmariadb-git-da9f2149dea1c20c5dc52d0de5bcd0ff19c99fc1.tar.gz
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
Diffstat (limited to 'sql/item_cmpfunc.h')
-rw-r--r--sql/item_cmpfunc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 0e157fd412c..4635a301c31 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -843,7 +843,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();