diff options
author | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2018-10-16 13:02:50 +0530 |
---|---|---|
committer | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2018-10-16 13:02:50 +0530 |
commit | 1dacd5f299be63b8dea8f6ff802739abba96b4e1 (patch) | |
tree | 6c3b89f7262e5deee84f1f98681b841f6809a994 /include | |
parent | 3c5f6aa21c54e2f93c96162a23f2e32772cf50bf (diff) | |
download | mariadb-git-1dacd5f299be63b8dea8f6ff802739abba96b4e1.tar.gz |
MDEV-12547: InnoDB FULLTEXT index has too strict innodb_ft_result_cache_limit max limit
- Backported the MYSQL_SYSVAR_SIZE_T to 10.0
- The parameter innodb_ft_result_cache_limit was only 32 bits wide
also on 64-bit systems. Make it size_t, so that it will be 64 bits
on 64-bit systems.
- Added a test case that show how innodb_ft_result_cache_limit variables
behaves in 32bit and 64 bit system.
Diffstat (limited to 'include')
-rw-r--r-- | include/mysql/plugin.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index ceb6ac93ff5..307138ad4db 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -383,6 +383,18 @@ DECLARE_MYSQL_SYSVAR_SIMPLE(name, unsigned long long) = { \ PLUGIN_VAR_LONGLONG | PLUGIN_VAR_UNSIGNED | ((opt) & PLUGIN_VAR_MASK), \ #name, comment, check, update, &varname, def, min, max, blk } +#ifdef _WIN64 +#define MYSQL_SYSVAR_SIZE_T(name, varname, opt, comment, check, update, def, min, max, blk) \ +DECLARE_MYSQL_SYSVAR_SIMPLE(name, size_t) = { \ + PLUGIN_VAR_LONGLONG | PLUGIN_VAR_UNSIGNED | ((opt) & PLUGIN_VAR_MASK), \ + #name, comment, check, update, &varname, def, min, max, blk } +#else +#define MYSQL_SYSVAR_SIZE_T(name, varname, opt, comment, check, update, def, min, max, blk) \ +DECLARE_MYSQL_SYSVAR_SIMPLE(name, size_t) = { \ + PLUGIN_VAR_LONG | PLUGIN_VAR_UNSIGNED | ((opt) & PLUGIN_VAR_MASK), \ + #name, comment, check, update, &varname, def, min, max, blk } +#endif + #define MYSQL_SYSVAR_ENUM(name, varname, opt, comment, check, update, def, typelib) \ DECLARE_MYSQL_SYSVAR_TYPELIB(name, unsigned long) = { \ PLUGIN_VAR_ENUM | ((opt) & PLUGIN_VAR_MASK), \ |