diff options
author | unknown <vva@eagle.mysql.r18.ru> | 2004-02-05 18:59:13 +0400 |
---|---|---|
committer | unknown <vva@eagle.mysql.r18.ru> | 2004-02-05 18:59:13 +0400 |
commit | e5ab70702c082c77401052f940b18b5f6d50a8c3 (patch) | |
tree | bb87963a9b5ff4660218618c67ada3a8300fda57 | |
parent | 7b0ee22df4c8c8fe815165191ee20d952b9f987c (diff) | |
parent | 04675623d691f539b25ac95b76425477f7a448d9 (diff) | |
download | mariadb-git-e5ab70702c082c77401052f940b18b5f6d50a8c3.tar.gz |
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1
-rw-r--r-- | sql/item_func.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index f90fcd5149e..e49980af733 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -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; } |