Commit d1a31ef5 authored by unknown's avatar unknown
Browse files

Merge zippy.(none):/home/cmiller/work/mysql/mysql-4.0__bug19006 

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-4.1


client/sql_string.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_string.h:
  Auto merged
configure.in:
  Null merge.
sql/item_strfunc.cc:
  Null merged
parents 665db1a6 89c7db0c

sql/item_func.h

+4 −1
Original line number Diff line number Diff line
@@ -138,7 +138,10 @@ class Item_func :public Item_result_field 
  {

    return (null_value=args[0]->get_time(ltime));

  }

  bool is_null() { (void) val_int(); return null_value; }

  bool is_null() { 

    (void) val_int();  /* Discard result. It sets null_value as side-effect. */ 

    return null_value; 

  }

  friend class udf_handler;

  Field *tmp_table_field() { return result_field; }

  Field *tmp_table_field(TABLE *t_arg);