From 6e04af1b78902314ade8f54348898436a85e691d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 26 Apr 2018 12:59:13 +0300 Subject: [PATCH] Remove dead code HAVE_LZO1X MariaDB uses HAVE_LZO, not HAVE_LZO1X (which was never defined). Also, the variable srv_lzo_disabled was never defined or read (only declared and assigned to, in unreachable code). --- storage/innobase/srv/srv0start.cc | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 2b08508ed349f..4c043695f1ca7 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -109,11 +109,6 @@ Created 2/16/1996 Heikki Tuuri #include "btr0scrub.h" #include "ut0new.h" -#ifdef HAVE_LZO1X -#include -extern bool srv_lzo_disabled; -#endif /* HAVE_LZO1X */ - /** Log sequence number immediately after startup */ lsn_t srv_start_lsn; /** Log sequence number at shutdown */ @@ -1519,16 +1514,6 @@ innobase_start_or_create_for_mysql() srv_use_doublewrite_buf = FALSE; } -#ifdef HAVE_LZO1X - if (lzo_init() != LZO_E_OK) { - ib::warn() << "lzo_init() failed, support disabled"; - srv_lzo_disabled = true; - } else { - ib::info() << "LZO1X support available"; - srv_lzo_disabled = false; - } -#endif /* HAVE_LZO1X */ - compile_time_assert(sizeof(ulint) == sizeof(void*)); #ifdef UNIV_DEBUG