Commit 3ac1c2ca authored by ramil@mysql.com's avatar ramil@mysql.com

a fix (#11235: Expression with IFNULL yields 18 where 1 is correct).

parent df93c278
...@@ -879,11 +879,11 @@ longlong Item_func_numhybrid::val_int() ...@@ -879,11 +879,11 @@ longlong Item_func_numhybrid::val_int()
return (longlong)real_op(); return (longlong)real_op();
case STRING_RESULT: case STRING_RESULT:
{ {
char *end_not_used;
int err_not_used; int err_not_used;
String *res= str_op(&str_value); String *res= str_op(&str_value);
char *end= (char*) res->ptr() + res->length();
CHARSET_INFO *cs= str_value.charset(); 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); &err_not_used) : 0);
} }
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment