Merge mysql.com:/home/jimw/my/mysql-4.1-12925

into  mysql.com:/home/jimw/my/mysql-4.1-clean


tests/mysql_client_test.c:
  Auto merged

1 files changed, 3 insertions, 3 deletions

diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 53e46932167..dfc3fb3d39c 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -689,10 +689,10 @@ static longlong getopt_ll(char *arg, const struct my_option *optp, int *err)
   ulonglong block_size= (optp->block_size ? (ulonglong) optp->block_size : 1L);
   
   num= eval_num_suffix(arg, err, (char*) optp->name);
-  if (num > 0 && (ulonglong) num > (ulonglong) (ulong) optp->max_value &&
+  if (num > 0 && (ulonglong) num > (ulonglong) optp->max_value &&
       optp->max_value) /* if max value is not set -> no upper limit */
-    num= (longlong) (ulong) optp->max_value;
-  num= ((num - (longlong) optp->sub_size) / block_size);
+    num= (ulonglong) optp->max_value;
+  num= ((num - optp->sub_size) / block_size);
   num= (longlong) (num * block_size);
   return max(num, optp->min_value);
 }