diff options
| -rw-r--r-- | include/config-netware.h | 3 | ||||
| -rw-r--r-- | sql/ha_archive.cc | 2 | ||||
| -rw-r--r-- | sql/handler.cc | 6 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/include/config-netware.h b/include/config-netware.h index 7def0053bf2..f517e3c34d3 100644 --- a/include/config-netware.h +++ b/include/config-netware.h @@ -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 diff --git a/sql/ha_archive.cc b/sql/ha_archive.cc index 2747f678cc3..c60d40c2685 100644 --- a/sql/ha_archive.cc +++ b/sql/ha_archive.cc @@ -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> diff --git a/sql/handler.cc b/sql/handler.cc index 47010de3002..4c60f460a23 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -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 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index aaa467603f5..2705615111a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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; |