diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-11-10 23:58:22 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-11-10 23:58:22 +0400 |
| commit | 747cb198b606d384cc280751ecc00710dce55cf5 (patch) | |
| tree | 32df73135729e2387a165549d5dfc09efb3c83b1 /sql/item_cmpfunc.cc | |
| parent | 6b00e6eb2cbee14e6e9510699f57439ed4a8254d (diff) | |
| parent | e7c6a81f2574840b61b9260e97789980337ca18b (diff) | |
| download | mariadb-git-747cb198b606d384cc280751ecc00710dce55cf5.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28076
into gleb.loc:/home/uchum/work/bk/5.0-opt
sql/item_cmpfunc.cc:
Auto merged
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]); |