Merge deer.(none):/home/hf/work/mysql-4.1.clean

into deer.(none):/home/hf/work/mysql-4.1.1676


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 75839bb80c3..be20a9b4fc7 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -211,8 +211,8 @@ class Item_func_signed :public Item_int_func
 {
 public:
   Item_func_signed(Item *a) :Item_int_func(a) {}
-  double val() { return args[0]->val(); }
-  longlong val_int() { return args[0]->val_int(); }
+  double val() {  null_value=args[0]->null_value; return args[0]->val(); }
+  longlong val_int() {  null_value=args[0]->null_value; return args[0]->val_int(); }
   void fix_length_and_dec()
   { max_length=args[0]->max_length; unsigned_flag=0; }
   void print(String *str);
@@ -223,8 +223,8 @@ class Item_func_unsigned :public Item_int_func
 {
 public:
   Item_func_unsigned(Item *a) :Item_int_func(a) {}
-  double val() { return args[0]->val(); }
-  longlong val_int() { return args[0]->val_int(); }
+  double val() { null_value=args[0]->null_value; return args[0]->val(); }
+  longlong val_int() { null_value=args[0]->null_value; return args[0]->val_int(); }
   void fix_length_and_dec()
   { max_length=args[0]->max_length; unsigned_flag=1; }
   void print(String *str);