diff options
author | unknown <bell@sanja.is.com.ua> | 2005-02-09 21:08:08 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2005-02-09 21:08:08 +0200 |
commit | 86d5bfc42b11773d74aa04b014e4304e5a1b9440 (patch) | |
tree | b282078b0a55de48c5719097df453c4d80e1d4d9 /sql/item_cmpfunc.cc | |
parent | fa657a0642fb02ba36b00ef23c06ae1eab710f61 (diff) | |
download | mariadb-git-86d5bfc42b11773d74aa04b014e4304e5a1b9440.tar.gz |
reverted patch for BUG#7351 (because of performance ussie)
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r-- | sql/item_cmpfunc.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 2b9a612da18..79295eb90b0 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -636,13 +636,12 @@ longlong Item_in_optimizer::val_int() { DBUG_ASSERT(fixed == 1); cache->store(args[0]); - longlong tmp= args[1]->val_int_result(); if (cache->null_value) { - if (tmp) - null_value= 1; + null_value= 1; return 0; } + longlong tmp= args[1]->val_int_result(); null_value= args[1]->null_value; return tmp; } |