Skip to content

M
mariadb
Commit a64daceb authored by Jan Lindström's avatar Jan Lindström
Browse files
Options

Fixed compiler errors caused by merge error.

parent b5cdc5ad
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
storage/innobase/handler/ha_innodb.cc
View file @ a64daceb
...@@ -16806,9 +16806,9 @@ static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm, ...@@ -16806,9 +16806,9 @@ static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
#if defined(HAVE_LZO) && defined(HAVE_LZ4) #if defined(HAVE_LZO) && defined(HAVE_LZ4)
PAGE_ALGORITHM_LAST, PAGE_ALGORITHM_LAST,
#elif defined(HAVE_LZ4) && !defined(HAVE_LZO) #elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
PAGE_ALGORITHM_LZ4, PAGE_LZ4_ALGORITHM,
#else #else
PAGE_ALGORITHM_ZLIB, PAGE_ZLIB_ALGORITHM,
#endif #endif
0); 0);
......
storage/xtradb/handler/ha_innodb.cc
View file @ a64daceb
...@@ -17963,9 +17963,9 @@ static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm, ...@@ -17963,9 +17963,9 @@ static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
#if defined(HAVE_LZO) && defined(HAVE_LZ4) #if defined(HAVE_LZO) && defined(HAVE_LZ4)
PAGE_ALGORITHM_LAST, PAGE_ALGORITHM_LAST,
#elif defined(HAVE_LZ4) && !defined(HAVE_LZO) #elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
PAGE_ALGORITHM_LZ4, PAGE_LZ4_ALGORITHM,
#else #else
PAGE_ALGORITHM_ZLIB, PAGE_ZLIB_ALGORITHM,
#endif #endif
0); 0);
......
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