bk commit into 4.1 tree (cmiller:1.2533)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
4.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-11 07:24:59-04:00, cmiller@zippy.(none) +5 -0
  Merge zippy.(none):/home/cmiller/work/mysql/mysql-4.0__bug19006
  into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-4.1
  MERGE: 1.1346.1.839

  client/sql_string.h@stripped, 2006-07-11 07:20:53-04:00, cmiller@zippy.(none) +0 -8
    Auto merged
    MERGE: 1.6.1.1

  configure.in@stripped, 2006-07-11 07:21:35-04:00, cmiller@zippy.(none) +0 -15
    Null merge.
    MERGE: 1.191.1.145

  sql/item_func.h@stripped, 2006-07-11 07:20:54-04:00, cmiller@zippy.(none) +0 -0
    Auto merged
    MERGE: 1.39.1.28

  sql/item_strfunc.cc@stripped, 2006-07-11 07:24:58-04:00, cmiller@zippy.(none) +0 -2
    Null merged
    MERGE: 1.36.1.52

  sql/sql_string.h@stripped, 2006-07-11 07:20:54-04:00, cmiller@zippy.(none) +0 -8
    Auto merged
    MERGE: 1.13.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.(none)
# Root:	/home/cmiller/work/mysql/merge/mysql-4.1/RESYNC

--- 1.129/sql/item_func.h	2006-07-11 07:25:02 -04:00
+++ 1.130/sql/item_func.h	2006-07-11 07:25:02 -04:00
@@ -138,7 +138,10 @@
   {
     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);