merge fixes (use old code)

client/mysqladmin.c:
  Auto merged
client/mysqltest.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index ac1af32388f..ab24b615365 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -984,7 +984,7 @@ double
 Item_func_nullif::val()
 {
   double value;
-  if (!cmp.compare() || null_value)
+  if (!cmp.compare())
   {
     null_value=1;
     return 0.0;
@@ -998,7 +998,7 @@ longlong
 Item_func_nullif::val_int()
 {
   longlong value;
-  if (!cmp.compare() || null_value)
+  if (!cmp.compare())
   {
     null_value=1;
     return 0;
@@ -1012,7 +1012,7 @@ String *
 Item_func_nullif::val_str(String *str)
 {
   String *res;
-  if (!cmp.compare() || null_value)
+  if (!cmp.compare())
   {
     null_value=1;
     return 0;