Commit eb12c38b authored by unknown's avatar unknown
Browse files

remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably... 

remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source


include/config-netware.h:
  put undef HAVE_ARCHIVE_DB where it belongs
parent aa736473

include/config-netware.h

+2 −1
Original line number Diff line number Diff line
@@ -72,9 +72,10 @@ extern "C" { 
  #undef HAVE_CRYPT

#endif /* HAVE_OPENSSL */



/* Configure can't detect this because it uses AC_TRY_RUN */

/* Netware has an ancient zlib */

#undef HAVE_COMPRESS

#define HAVE_COMPRESS

#undef HAVE_ARCHIVE_DB



/* include the old function apis */

#define USE_OLD_FUNCTIONS 1

sql/ha_archive.cc

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include "mysql_priv.h"



#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)

#if defined(HAVE_ARCHIVE_DB)

#include "ha_archive.h"

#include <my_dir.h>

sql/handler.cc

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ handlerton example_hton = { "EXAMPLE", SHOW_OPTION_NO, 
  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 

  HTON_NO_FLAGS };

#endif

#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)

#if defined(HAVE_ARCHIVE_DB)

#include "ha_archive.h"

extern handlerton archive_hton;

#else
@@ -314,7 +314,7 @@ handler *get_new_handler(TABLE *table, MEM_ROOT *alloc, enum db_type db_type) 
  case DB_TYPE_EXAMPLE_DB:

    return new (alloc) ha_example(table);

#endif

#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)

#if defined(HAVE_ARCHIVE_DB)

  case DB_TYPE_ARCHIVE_DB:

    return new (alloc) ha_archive(table);

#endif
@@ -513,7 +513,7 @@ int ha_panic(enum ha_panic_function flag) 
  if (have_federated_db == SHOW_OPTION_YES)

    error|= federated_db_end();

#endif

#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)

#if defined(HAVE_ARCHIVE_DB)

  if (have_archive_db == SHOW_OPTION_YES)

    error|= archive_db_end();

#endif

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -6323,7 +6323,7 @@ static void mysql_init_variables(void) 
#else

  have_example_db= SHOW_OPTION_NO;

#endif

#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)

#if defined(HAVE_ARCHIVE_DB)

  have_archive_db= SHOW_OPTION_YES;

#else

  have_archive_db= SHOW_OPTION_NO;