Commit c9bf3024 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/usr/home/ram/work/mysql-5.0
parents a52706ca d5d55711

sql/item_func.cc

+2 −2
Original line number Diff line number Diff line
@@ -879,11 +879,11 @@ longlong Item_func_numhybrid::val_int() 
    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: