diff options
author | unknown <knielsen@knielsen-hq.org> | 2012-09-26 15:30:08 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2012-09-26 15:30:08 +0200 |
commit | 37155bf74a29a57829cc13947ac346b0f2c8fd28 (patch) | |
tree | ac37a43975fd4d3971f089955d74793ccd1e73ce /storage/maria/ha_maria.cc | |
parent | 7d82c6fa04a1469e657e2edb08e1629cd94c8c12 (diff) | |
download | mariadb-git-37155bf74a29a57829cc13947ac346b0f2c8fd28.tar.gz |
Fix some failures in 5.1 Buildbot:
- Fix some warnings in newer GCC (-Werror ...).
- Fix wrong STACK_DIRECTION detected by configure due to compiler inlining.
Diffstat (limited to 'storage/maria/ha_maria.cc')
-rw-r--r-- | storage/maria/ha_maria.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index b261451d8dc..09df4c9e03b 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -186,7 +186,7 @@ static MYSQL_SYSVAR_ULONG(pagecache_age_threshold, "until it is considered aged enough to be downgraded to a warm block. " "This specifies the percentage ratio of that number of hits to the " "total number of blocks in the page cache.", 0, 0, - 300, 100, ~0L, 100); + 300, 100, ~(unsigned long)0, 100); static MYSQL_SYSVAR_ULONGLONG(pagecache_buffer_size, pagecache_buffer_size, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY, @@ -209,12 +209,12 @@ static MYSQL_SYSVAR_SET(recover, maria_recover_options, PLUGIN_VAR_OPCMDARG, static MYSQL_THDVAR_ULONG(repair_threads, PLUGIN_VAR_RQCMDARG, "Number of threads to use when repairing maria tables. The value of 1 " "disables parallel repair.", - 0, 0, 1, 1, ~0L, 1); + 0, 0, 1, 1, ~(unsigned long)0, 1); static MYSQL_THDVAR_ULONG(sort_buffer_size, PLUGIN_VAR_RQCMDARG, "The buffer that is allocated when sorting the index when doing a " "REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.", - 0, 0, 128L*1024L*1024L, 4, ~0L, 1); + 0, 0, 128L*1024L*1024L, 4, ~(unsigned long)0, 1); static MYSQL_THDVAR_ENUM(stats_method, PLUGIN_VAR_RQCMDARG, "Specifies how maria index statistics collection code should treat " |