diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-09-26 18:29:49 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-09-26 18:29:49 +0200 |
| commit | 7ca49db57cc4b1831587b764c3a1beb086a90f0c (patch) | |
| tree | bcf5936909c9a45ffd35c91138ff74a53a585496 /storage/maria | |
| parent | 9ae909643d2819fe139e389ca60f9f3076b37861 (diff) | |
| parent | 37155bf74a29a57829cc13947ac346b0f2c8fd28 (diff) | |
| download | mariadb-git-7ca49db57cc4b1831587b764c3a1beb086a90f0c.tar.gz | |
Merge from 5.1.
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/compat_aliases.cc | 6 | ||||
| -rw-r--r-- | storage/maria/ha_maria.cc | 2 | ||||
| -rw-r--r-- | storage/maria/ma_ft_nlq_search.c | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/storage/maria/compat_aliases.cc b/storage/maria/compat_aliases.cc index 068c8b9bdef..ead49fd98f9 100644 --- a/storage/maria/compat_aliases.cc +++ b/storage/maria/compat_aliases.cc @@ -88,7 +88,7 @@ ulong pagecache_age_threshold_alias; static MYSQL_SYSVAR_ULONG(pagecache_age_threshold, pagecache_age_threshold_alias, PLUGIN_VAR_RQCMDARG, "Deprecated, use --aria-pagecache-age-threshold instead", - 0, 0, 300, 100, ~0L, 100); + 0, 0, 300, 100, ~(unsigned long)0, 100); ulonglong pagecache_buffer_size_alias; static MYSQL_SYSVAR_ULONGLONG(pagecache_buffer_size, pagecache_buffer_size_alias, @@ -110,12 +110,12 @@ static MYSQL_SYSVAR_SET(recover, recover_alias, PLUGIN_VAR_OPCMDARG, ulong repair_threads_alias; static MYSQL_THDVAR_ULONG(repair_threads, PLUGIN_VAR_RQCMDARG, "Deprecated, use --aria-repair-threads instead", - 0, 0, 1, 1, ~0L, 1); + 0, 0, 1, 1, ~(unsigned long)0, 1); ulong sort_buffer_size_alias; static MYSQL_THDVAR_ULONG(sort_buffer_size, PLUGIN_VAR_RQCMDARG, "Deprecated, use --aria-sort-buffer-size instead", - 0, 0, 128L*1024L*1024L, 4, ~0L, 1); + 0, 0, 128L*1024L*1024L, 4, ~(unsigned long)0, 1); ulong stats_method_alias; static MYSQL_THDVAR_ENUM(stats_method, PLUGIN_VAR_RQCMDARG, diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 4ba08ad4b3d..83c8144aad2 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -229,7 +229,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, diff --git a/storage/maria/ma_ft_nlq_search.c b/storage/maria/ma_ft_nlq_search.c index e0e1e2ce0d3..7506c5dd12b 100644 --- a/storage/maria/ma_ft_nlq_search.c +++ b/storage/maria/ma_ft_nlq_search.c @@ -82,6 +82,7 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) #error #endif DBUG_ENTER("walk_and_match"); + LINT_INIT(subkeys.i); word->weight=LWS_FOR_QUERY; |