diff options
| author | monty@mashka.mysql.fi <> | 2003-08-11 22:44:43 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-08-11 22:44:43 +0300 |
| commit | 2263e3e51faba531a0a7055dbf706a6a8719ad70 (patch) | |
| tree | 3c0ddcb446b8be099c3ab2616c459a573ee3cf92 /mysys/my_getopt.c | |
| parent | 1279f9b024614cf97cf447cfb10d6d7d69abb8bc (diff) | |
| parent | 6e7a509d06824447e427dd44d5692489267d9c4b (diff) | |
| download | mariadb-git-2263e3e51faba531a0a7055dbf706a6a8719ad70.tar.gz | |
Merge with 4.0.14
Diffstat (limited to 'mysys/my_getopt.c')
| -rw-r--r-- | mysys/my_getopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index d539489cf1e..cbbf876ac06 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -670,9 +670,9 @@ static ulonglong getopt_ull(char *arg, const struct my_option *optp, int *err) ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp) { - if ((ulonglong) num > (ulonglong) (ulong) optp->max_value && + if ((ulonglong) num > (ulonglong) optp->max_value && optp->max_value) /* if max value is not set -> no upper limit */ - num= (ulonglong) (ulong) optp->max_value; + num= (ulonglong) optp->max_value; if (optp->block_size > 1) { num/= (ulonglong) optp->block_size; |