Commit d200443b authored by vva@eagle.mysql.r18.ru's avatar vva@eagle.mysql.r18.ru

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1
parents d0d54abc 4fbc147b
......@@ -2648,10 +2648,9 @@ longlong Item_func_inet_aton::val_int()
}
if (c != '.') // IP number can't end on '.'
{
switch (dot_count)
{
case 1: result<<= 8;
case 2: result<<= 8;
switch (dot_count) {
case 1: result<<= 8; /* fall through */
case 2: result<<= 8; /* fall through */
}
return (result << 8) + (ulonglong) byte_result;
}
......
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