diff options
| author | tnurnberg@mysql.com/white.intern.koehntopp.de <> | 2007-12-03 10:01:56 +0100 |
|---|---|---|
| committer | tnurnberg@mysql.com/white.intern.koehntopp.de <> | 2007-12-03 10:01:56 +0100 |
| commit | 658f66e36eea292f8248b26397fc7de93a4b9dc9 (patch) | |
| tree | 9dfddae4fce46f28fa673e892155521b2f2966b8 /mysys/my_getopt.c | |
| parent | 31d4e58ad4c26fea1367ddb00ea0c26a17d3ddfc (diff) | |
| download | mariadb-git-658f66e36eea292f8248b26397fc7de93a4b9dc9.tar.gz | |
Bug#31177: Server variables can't be set to their current values
additional fixes for 64-bit
Diffstat (limited to 'mysys/my_getopt.c')
| -rw-r--r-- | mysys/my_getopt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index f41e8166876..9174d91dce7 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -799,7 +799,7 @@ ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp, bool *fix) { bool adjusted= FALSE; - ulonglong old= num, mod; + ulonglong old= num; char buf1[255], buf2[255]; if ((ulonglong) num > (ulonglong) optp->max_value && @@ -824,6 +824,8 @@ ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp, num= ((ulonglong) ULONG_MAX); adjusted= TRUE; } +#else + num= min(num, LONG_MAX); #endif break; default: |