diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-06-05 03:48:25 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-06-05 03:48:25 +0300 |
| commit | d82a86e61b04c0d78a3216d97a346c24bd2dd218 (patch) | |
| tree | c3801de3a55a3908dafdbc48f1bb034307fc85fc /mysys/getvar.c | |
| parent | fe1842d9ee1a7e51f74ca192d3181968f16a0b29 (diff) | |
| parent | 011b141574d8b4c07b9f6b0f8c2f44b18d751646 (diff) | |
| download | mariadb-git-d82a86e61b04c0d78a3216d97a346c24bd2dd218.tar.gz | |
merge
client/mysqltest.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysys/getvar.c')
| -rw-r--r-- | mysys/getvar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/getvar.c b/mysys/getvar.c index e0f60b207b7..90ab599244d 100644 --- a/mysys/getvar.c +++ b/mysys/getvar.c @@ -101,7 +101,7 @@ my_bool set_changeable_var(my_string str,CHANGEABLE_VAR *vars) } if (num < (longlong) found->min_value) num=(longlong) found->min_value; - else if (num > (longlong) (ulong) found->max_value) + else if (num > 0 && (ulonglong) num > (ulonglong) (ulong) found->max_value) num=(longlong) (ulong) found->max_value; num=((num- (longlong) found->sub_size) / (ulonglong) found->block_size); (*found->varptr)= (long) (num*(ulonglong) found->block_size); |