summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.h
diff options
context:
space:
mode:
authorigor@olga.mysql.com <>2007-01-09 10:26:28 -0800
committerigor@olga.mysql.com <>2007-01-09 10:26:28 -0800
commit5cd4ba4e0bc6fb4de75f5ebba9752b3a8093994a (patch)
tree3ef44670480dd97c145363fba05d5c1a9d5aa323 /sql/item_cmpfunc.h
parent0fa12d249105c1e0a0026f8931e7efcbbfce30e0 (diff)
parent8642d23b6a1ef75d9120ba0871de2c183feee7db (diff)
downloadmariadb-git-5cd4ba4e0bc6fb4de75f5ebba9752b3a8093994a.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
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 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();