diff options
author | gshchepa/uchum@gleb.loc <> | 2007-11-10 23:58:22 +0400 |
---|---|---|
committer | gshchepa/uchum@gleb.loc <> | 2007-11-10 23:58:22 +0400 |
commit | e5394523d34edb6bc2de52c60d33c43c616ee36f (patch) | |
tree | 32df73135729e2387a165549d5dfc09efb3c83b1 /sql/item_cmpfunc.cc | |
parent | d97dd5a4e50a533dc62a5120bf052beb971da893 (diff) | |
parent | 0aabb89ee11a7492a0788470be9a6ba018152c9f (diff) | |
download | mariadb-git-e5394523d34edb6bc2de52c60d33c43c616ee36f.tar.gz |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28076
into gleb.loc:/home/uchum/work/bk/5.0-opt
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r-- | sql/item_cmpfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index e67ad30f9c5..85ec8fa40d6 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1386,7 +1386,7 @@ longlong Item_func_truth::val_int() bool Item_in_optimizer::fix_left(THD *thd, Item **ref) { if (!args[0]->fixed && args[0]->fix_fields(thd, args) || - !cache && !(cache= Item_cache::get_cache(args[0]->result_type()))) + !cache && !(cache= Item_cache::get_cache(args[0]))) return 1; cache->setup(args[0]); |