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

into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1
d200443b · vva@eagle.mysql.r18.ru · d0d54abc · 4fbc147b · d200443b
Commit d200443b authored Feb 05, 2004 by vva@eagle.mysql.r18.ru
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

sql/item_func.cc sql/item_func.cc +3 -4

No files found.
--- 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)
+    switch (dot_count) {
-    {
+    case 1: result<<= 8; /* fall through */
-    case 1: result<<= 8;
+    case 2: result<<= 8; /* fall through */
-    case 2: result<<= 8;
    }
    return (result << 8) + (ulonglong) byte_result;
  }