diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-06-17 16:24:31 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-06-17 16:24:31 +0300 |
| commit | cc7693e19f009a83e25b24568d64b390ed1106e3 (patch) | |
| tree | c7ca1c850a0c582a1a071ffcc33f4402a6865992 /mysys/my_getopt.c | |
| parent | 231b0ff8dd13dc39a1ab94ed7c24b4a2d40e9c1c (diff) | |
| parent | ad5c763e74821465cc8237aa39e2391239a17206 (diff) | |
| download | mariadb-git-cc7693e19f009a83e25b24568d64b390ed1106e3.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
include/my_global.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 759c96462f6..e18c5a0b9eb 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -609,9 +609,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; |