Skip to content

Commit ff3f63c

Browse files
author
Jan Lindström
committed
Fix compiler errors caused by merge error.
1 parent d12dbe7 commit ff3f63c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

storage/innobase/handler/ha_innodb.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16915,9 +16915,9 @@ static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
1691516915
#if defined(HAVE_LZO) && defined(HAVE_LZ4)
1691616916
PAGE_ALGORITHM_LAST,
1691716917
#elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
16918-
PAGE_ALGORITHM_LZ4,
16918+
PAGE_LZ4_ALGORITHM,
1691916919
#else
16920-
PAGE_ALGORITHM_ZLIB,
16920+
PAGE_ZLIB_ALGORITHM,
1692116921
#endif
1692216922
0);
1692316923

storage/xtradb/handler/ha_innodb.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18093,9 +18093,9 @@ static MYSQL_SYSVAR_LONG(compression_algorithm, innodb_compression_algorithm,
1809318093
#if defined(HAVE_LZO) && defined(HAVE_LZ4)
1809418094
PAGE_ALGORITHM_LAST,
1809518095
#elif defined(HAVE_LZ4) && !defined(HAVE_LZO)
18096-
PAGE_ALGORITHM_LZ4,
18096+
PAGE_LZ4_ALGORITHM,
1809718097
#else
18098-
PAGE_ALGORITHM_ZLIB,
18098+
PAGE_ZLIB_ALGORITHM,
1809918099
#endif
1810018100
0);
1810118101

0 commit comments

Comments
 (0)