summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.cc
diff options
context:
space:
mode:
authorunknown <baker@bk-internal.mysql.com>2006-12-18 17:57:34 +0100
committerunknown <baker@bk-internal.mysql.com>2006-12-18 17:57:34 +0100
commit2b0189b8120b068cb2fc7621d286e1ac1956b055 (patch)
treef463c582366219318920e4d19117d48624233b4f /sql/item_cmpfunc.cc
parentdcbf618831313cbc68c3e73975755738ed20f763 (diff)
parent8a2b3baaa9da6b94f0f609c1959ad00929ec7621 (diff)
downloadmariadb-git-2b0189b8120b068cb2fc7621d286e1ac1956b055.tar.gz
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch sql/field.cc: Auto merged sql/field.h: Auto merged sql/sql_load.cc: Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r--sql/item_cmpfunc.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index b1b73a523be..639017872a0 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -797,7 +797,8 @@ bool Item_in_optimizer::fix_left(THD *thd, Item **ref)
}
not_null_tables_cache= args[0]->not_null_tables();
with_sum_func= args[0]->with_sum_func;
- const_item_cache= args[0]->const_item();
+ if ((const_item_cache= args[0]->const_item()))
+ cache->store(args[0]);
return 0;
}