Skip to content

M
MariaDB
Commit 50354951 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

compilation failure on Windows 

VS doesn't like #ifdefs inside a macro expansion. move them outside
parent 7e7e1bf8
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 14 deletions
storage/innobase/handler/ha_innodb.cc
View file @ 50354951
...@@ -16797,19 +16797,20 @@ static MYSQL_SYSVAR_BOOL(use_trim, srv_use_trim, ...@@ -16797,19 +16797,20 @@ static MYSQL_SYSVAR_BOOL(use_trim, srv_use_trim,
"Use trim. Default FALSE.", "Use trim. Default FALSE.",
NULL, NULL, FALSE); NULL, NULL, FALSE);
#if defined(HAVE_LZO)
#define default_compression_algorithm PAGE_LZO_ALGORITHM
#elif defined(HAVE_LZ4)
#define default_compression_algorithm PAGE_LZ4_ALGORITHM
#else
#define default_compression_algorithm PAGE_ZLIB_ALGORITHM
#endif
static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm, static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
PLUGIN_VAR_OPCMDARG, PLUGIN_VAR_OPCMDARG,
"Compression algorithm used on page compression. 1 for zlib, 2 for lz3, 3 for lzo", "Compression algorithm used on page compression. 1 for zlib, 2 for lz3, 3 for lzo",
NULL, NULL, NULL, NULL,
PAGE_ZLIB_ALGORITHM, PAGE_ZLIB_ALGORITHM,
0, 0,
#if defined(HAVE_LZO) && defined(HAVE_LZ4) default_compression_algorithm,
PAGE_ALGORITHM_LAST,
#elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
PAGE_LZ4_ALGORITHM,
#else
PAGE_ZLIB_ALGORITHM,
#endif
0); 0);
static MYSQL_SYSVAR_LONG(mtflush_threads, srv_mtflush_threads, static MYSQL_SYSVAR_LONG(mtflush_threads, srv_mtflush_threads,
......
storage/xtradb/handler/ha_innodb.cc
View file @ 50354951
...@@ -17954,19 +17954,20 @@ static MYSQL_SYSVAR_BOOL(use_trim, srv_use_trim, ...@@ -17954,19 +17954,20 @@ static MYSQL_SYSVAR_BOOL(use_trim, srv_use_trim,
"Use trim. Default FALSE.", "Use trim. Default FALSE.",
NULL, NULL, FALSE); NULL, NULL, FALSE);
#if defined(HAVE_LZO)
#define default_compression_algorithm PAGE_LZO_ALGORITHM
#elif defined(HAVE_LZ4)
#define default_compression_algorithm PAGE_LZ4_ALGORITHM
#else
#define default_compression_algorithm PAGE_ZLIB_ALGORITHM
#endif
static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm, static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
PLUGIN_VAR_OPCMDARG, PLUGIN_VAR_OPCMDARG,
"Compression algorithm used on page compression. 1 for zlib, 2 for lz3, 3 for lzo", "Compression algorithm used on page compression. 1 for zlib, 2 for lz3, 3 for lzo",
NULL, NULL, NULL, NULL,
PAGE_ZLIB_ALGORITHM, PAGE_ZLIB_ALGORITHM,
0, 0,
#if defined(HAVE_LZO) && defined(HAVE_LZ4) default_compression_algorithm,
PAGE_ALGORITHM_LAST,
#elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
PAGE_LZ4_ALGORITHM,
#else
PAGE_ZLIB_ALGORITHM,
#endif
0); 0);
static MYSQL_SYSVAR_LONG(mtflush_threads, srv_mtflush_threads, static MYSQL_SYSVAR_LONG(mtflush_threads, srv_mtflush_threads,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7