Skip to content

Commit

Permalink
Remove dead code HAVE_LZO1X
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
dr-m committed Apr 26, 2018
1 parent c026e2c commit 6e04af1
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions storage/innobase/srv/srv0start.cc
Expand Up @@ -109,11 +109,6 @@ Created 2/16/1996 Heikki Tuuri
#include "btr0scrub.h"
#include "ut0new.h"

#ifdef HAVE_LZO1X
#include <lzo/lzo1x.h>
extern bool srv_lzo_disabled;
#endif /* HAVE_LZO1X */

/** Log sequence number immediately after startup */
lsn_t srv_start_lsn;
/** Log sequence number at shutdown */
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 6e04af1

Please sign in to comment.