From ff3f63c31fd0be9e70dc5e7babbb71dc06fbc5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Thu, 22 May 2014 19:01:41 +0300 Subject: [PATCH] Fix compiler errors caused by merge error. --- storage/innobase/handler/ha_innodb.cc | 4 ++-- storage/xtradb/handler/ha_innodb.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 52d3d1d0d39..fc8d29267b8 100644 --- 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); diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index d86502a268a..2cbd6b6039a 100644 --- 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);