Commit d1a31ef5 authored by unknown's avatar unknown

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
......@@ -138,7 +138,10 @@ public:
{
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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment