Fix compiler errors caused by merge error.

ff3f63c3 · Jan Lindström · d12dbe77 · ff3f63c3 · ff3f63c3
Commit ff3f63c3 authored May 22, 2014 by Jan Lindström
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.cc +2 -2

storage/xtradb/handler/ha_innodb.cc storage/xtradb/handler/ha_innodb.cc +2 -2

No files found.
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -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);


--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -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);