database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Fix compiler errors caused by merge error.

Browse Source
This commit is contained in:
Jan Lindström
2014-05-22 19:01:41 +03:00
parent d12dbe77e2
commit ff3f63c31f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/innobase/handler/ha_innodb.cc
View File

@@ -16915,9 +16915,9 @@ static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
#if defined(HAVE_LZO) && defined(HAVE_LZ4)
PAGE_ALGORITHM_LAST,
#elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
PAGE_ALGORITHM_LZ4,
PAGE_LZ4_ALGORITHM,
#else
PAGE_ALGORITHM_ZLIB,
PAGE_ZLIB_ALGORITHM,
#endif
0);

4
storage/xtradb/handler/ha_innodb.cc
View File

@@ -18093,9 +18093,9 @@ static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
#if defined(HAVE_LZO) && defined(HAVE_LZ4)
PAGE_ALGORITHM_LAST,
#elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
PAGE_ALGORITHM_LZ4,
PAGE_LZ4_ALGORITHM,
#else
PAGE_ALGORITHM_ZLIB,
PAGE_ZLIB_ALGORITHM,
#endif
0);