summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <tnurnberg@mysql.com/white.intern.koehntopp.de>2007-12-06 01:28:01 +0100
committerunknown <tnurnberg@mysql.com/white.intern.koehntopp.de>2007-12-06 01:28:01 +0100
commit4618d68d6d85141cd2422c892ed5053c72aa097a (patch)
treeddef382443551fdd438cec70128ab88a08413381 /mysys
parent53f7db282dc982e48c0a944e9c3f68ebc3d26db3 (diff)
downloadmariadb-git-4618d68d6d85141cd2422c892ed5053c72aa097a.tar.gz
Bug#31177: Server variables can't be set to their current values
additional fixes for BDB and correct assignment of both signed and unsigned 64-bit data to unsigned system variables mysql-test/r/ps_2myisam.result: account for UNSIGNED_FLAG mysql-test/r/ps_3innodb.result: account for UNSIGNED_FLAG mysql-test/r/ps_4heap.result: account for UNSIGNED_FLAG mysql-test/r/ps_5merge.result: account for UNSIGNED_FLAG mysql-test/r/ps_6bdb.result: account for UNSIGNED_FLAG mysql-test/r/ps_7ndb.result: account for UNSIGNED_FLAG mysys/my_getopt.c: We have correct signed/unsigned information now, so we no longer need to err on the side of caution. sql/item_func.cc: Copy unsigned info over from entry so the item's data correctly describe it. sql/mysqld.cc: BDB log buffer size: default can't be less than minimum sql/set_var.cc: Handle signedness of in-values correctly when assigning to unsigned types, all the way up to 64-bit. Use handler from all three unsigned sysvar types. sql/set_var.h: thd_ulonglong: Override default check with one for unsigned types
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_getopt.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 9174d91dce7..3bb500616a1 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -824,8 +824,6 @@ 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: