From a64daceb5993cd4e80260e789de271b4d4f184af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Thu, 22 May 2014 19:48:34 +0300 Subject: [PATCH] Fixed 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 67b81710422..f3d0cd47a23 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -16806,9 +16806,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 f08a9607d7d..123e72ecdd7 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -17963,9 +17963,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);