4.1 -> 5.0 merge

client/mysql.cc:
  Auto merged
client/sql_string.h:
  Auto merged
configure.in:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/table.cc:
  Auto merged

1 files changed, 4 insertions, 1 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 2ca4be9f3f2..c54fc701c53 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -156,7 +156,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; 
+  }
   void signal_divide_by_null();
   friend class udf_handler;
   Field *tmp_table_field() { return result_field; }