List:Commits« Previous MessageNext Message »
From:mhansson Date:May 29 2007 10:03am
Subject:bk commit into 5.1 tree (mhansson:1.2515)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mhansson. When mhansson 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, 2007-05-29 12:02:46+02:00, mhansson@stripped +1 -0
  Merge mhansson@stripped:/home/bk/mysql-5.1-opt
  into  dl145s.mysql.com:/users/mhansson/mysql/autopush/my51-bug28250
  MERGE: 1.2475.65.1

  sql/item_func.cc@stripped, 2007-05-29 12:02:39+02:00, mhansson@stripped +0 -0
    Auto merged
    MERGE: 1.390.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:	mhansson
# Host:	dl145s.mysql.com
# Root:	/users/mhansson/mysql/autopush/my51-bug28250/RESYNC

--- 1.398/sql/item_func.cc	2007-05-28 06:33:15 +02:00
+++ 1.399/sql/item_func.cc	2007-05-29 12:02:39 +02:00
@@ -994,6 +994,8 @@ longlong Item_func_unsigned::val_int()
     my_decimal tmp, *dec= args[0]->val_decimal(&tmp);
     if (!(null_value= args[0]->null_value))
       my_decimal2int(E_DEC_FATAL_ERROR, dec, 1, &value);
+    else
+      value= 0;
     return value;
   }
   else if (args[0]->cast_to_int_type() != STRING_RESULT ||
Thread
bk commit into 5.1 tree (mhansson:1.2515)mhansson29 May