Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1
This commit is contained in:
commit
d200443bed
@ -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;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user