From 8c5d5bc5de135ed143bfe91c99fd53a8c9b4487c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Mon, 3 Feb 2014 10:08:15 +0200 Subject: Fixed merge error on InnoDB page compression level handling. Merged page compression feature to XtraDB storage engine. Added feature where page compression can use lz4 compression method (innodb_use_lz4, default OFF). --- storage/innobase/include/fsp0pagecompress.ic | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'storage/innobase/include/fsp0pagecompress.ic') diff --git a/storage/innobase/include/fsp0pagecompress.ic b/storage/innobase/include/fsp0pagecompress.ic index 755d91b3cd9..10f9d30d1f8 100644 --- a/storage/innobase/include/fsp0pagecompress.ic +++ b/storage/innobase/include/fsp0pagecompress.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (C) 2013 SkySQL Ab. All Rights Reserved. +Copyright (C) 2013,2014 SkySQL Ab. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -144,6 +144,9 @@ fil_get_compression_alg_name( case FIL_PAGE_COMPRESSION_ZLIB: return ("ZLIB"); break; + case FIL_PAGE_COMPRESSION_LZ4: + return ("LZ4"); + break; default: return("UNKNOWN"); break; -- cgit v1.2.1