diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-01 10:37:36 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-02 17:29:04 +0000 |
| commit | 2be18d9b7f12f6eed577b5a4a29e0c7162dfa76e (patch) | |
| tree | 88ae26f12fd02e02a92e2538d6ec9934b1622662 | |
| parent | c35a5884b05c380839031b16aad47cc6dc023847 (diff) | |
| download | mariadb-git-2be18d9b7f12f6eed577b5a4a29e0c7162dfa76e.tar.gz | |
Fix the build on Windows.
Restore MYSQL_SYSVAR_UINT64_T and MYSQL_SYSVAR_SIZE_T in
plugin.h
| -rw-r--r-- | include/mysql/plugin.h | 17 | ||||
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 12 |
2 files changed, 17 insertions, 12 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index a5bfa1bbc9e..2f077d8440e 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -393,6 +393,23 @@ 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 } +#define MYSQL_SYSVAR_UINT64_T(name, varname, opt, comment, check, update, def, min, max, blk) \ +DECLARE_MYSQL_SYSVAR_SIMPLE(name, uint64_t) = { \ + 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), \ diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 72b23f2655c..981acdf22b0 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -454,18 +454,6 @@ const int64 RDB_DEFAULT_BLOCK_CACHE_SIZE = 512 * 1024 * 1024; const int64 RDB_MIN_BLOCK_CACHE_SIZE = 1024; const int RDB_MAX_CHECKSUMS_PCT = 100; -#if SIZEOF_ULONG == SIZEOF_SIZE_T -#define MYSQL_SYSVAR_SIZE_T MYSQL_SYSVAR_ULONG -#else -#define MYSQL_SYSVAR_SIZE_T MYSQL_SYSVAR_ULONGLONG -#endif - -#if SIZEOF_ULONG == SIZEOF_UINT64_T -#define MYSQL_SYSVAR_UINT64_T MYSQL_SYSVAR_ULONG -#else -#define MYSQL_SYSVAR_UINT64_T MYSQL_SYSVAR_ULONGLONG -#endif - // TODO: 0 means don't wait at all, and we don't support it yet? static MYSQL_THDVAR_ULONG(lock_wait_timeout, PLUGIN_VAR_RQCMDARG, "Number of seconds to wait for lock", nullptr, |