bk commit into 5.0 tree (ramil:1.1928)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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
  1.1928 05/06/14 13:40:12 ramil@stripped +1 -0
  a fix (#11235: Expression with IFNULL yields 18 where 1 is correct).

  sql/item_func.cc
    1.219 05/06/14 13:40:06 ramil@stripped +2 -2
    a fix (#11235: Expression with IFNULL yields 18 where 1 is correct).
    We should pass res end pointer to the strtoll10().

# 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:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/mysql-5.0

--- 1.218/sql/item_func.cc	2005-06-10 21:06:07 +05:00
+++ 1.219/sql/item_func.cc	2005-06-14 13:40:06 +05:00
@@ -879,11 +879,11 @@
     return (longlong)real_op();
   case STRING_RESULT:
   {
-    char *end_not_used;
     int err_not_used;
     String *res= str_op(&str_value);
+    char *end= (char*) res->ptr() + res->length();
     CHARSET_INFO *cs= str_value.charset();
-    return (res ? (*(cs->cset->strtoll10))(cs, res->ptr(), &end_not_used,
+    return (res ? (*(cs->cset->strtoll10))(cs, res->ptr(), &end,
                                            &err_not_used) : 0);
   }
   default: