diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-30 13:02:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-30 15:10:01 +0100 |
| commit | 44f6f445933e12cbc4cce63e2b7d983b9938d3b9 (patch) | |
| tree | f5230fb24510bb201eb33122a62939ce74588b83 /include | |
| parent | 8772824ce72a811ea92dd5cfb73602eb93237891 (diff) | |
| parent | f4b8b6b9a3ad4ce5e5218e2ec2dfe6dd34112e45 (diff) | |
| download | mariadb-git-44f6f445933e12cbc4cce63e2b7d983b9938d3b9.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_bit.h | 8 | ||||
| -rw-r--r-- | include/mysql/plugin.h | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/include/my_bit.h b/include/my_bit.h index a50403c312d..c571581f5e8 100644 --- a/include/my_bit.h +++ b/include/my_bit.h @@ -115,10 +115,10 @@ static inline uint32 my_clear_highest_bit(uint32 v) static inline uint32 my_reverse_bits(uint32 key) { return - (_my_bits_reverse_table[ key & 255] << 24) | - (_my_bits_reverse_table[(key>> 8) & 255] << 16) | - (_my_bits_reverse_table[(key>>16) & 255] << 8) | - _my_bits_reverse_table[(key>>24) ]; + ((uint32)_my_bits_reverse_table[ key & 255] << 24) | + ((uint32)_my_bits_reverse_table[(key>> 8) & 255] << 16) | + ((uint32)_my_bits_reverse_table[(key>>16) & 255] << 8) | + (uint32)_my_bits_reverse_table[(key>>24) ]; } /* diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 61be12057e8..47a3b9b43e1 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -393,6 +393,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), \ |