Commit eb12c38b authored by unknown's avatar unknown

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
...@@ -72,9 +72,10 @@ extern "C" { ...@@ -72,9 +72,10 @@ extern "C" {
#undef HAVE_CRYPT #undef HAVE_CRYPT
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
/* Configure can't detect this because it uses AC_TRY_RUN */ /* Netware has an ancient zlib */
#undef HAVE_COMPRESS #undef HAVE_COMPRESS
#define HAVE_COMPRESS #define HAVE_COMPRESS
#undef HAVE_ARCHIVE_DB
/* include the old function apis */ /* include the old function apis */
#define USE_OLD_FUNCTIONS 1 #define USE_OLD_FUNCTIONS 1
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "mysql_priv.h" #include "mysql_priv.h"
#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__) #if defined(HAVE_ARCHIVE_DB)
#include "ha_archive.h" #include "ha_archive.h"
#include <my_dir.h> #include <my_dir.h>
......
...@@ -60,7 +60,7 @@ handlerton example_hton = { "EXAMPLE", SHOW_OPTION_NO, ...@@ -60,7 +60,7 @@ handlerton example_hton = { "EXAMPLE", SHOW_OPTION_NO,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
HTON_NO_FLAGS }; HTON_NO_FLAGS };
#endif #endif
#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__) #if defined(HAVE_ARCHIVE_DB)
#include "ha_archive.h" #include "ha_archive.h"
extern handlerton archive_hton; extern handlerton archive_hton;
#else #else
...@@ -314,7 +314,7 @@ handler *get_new_handler(TABLE *table, MEM_ROOT *alloc, enum db_type db_type) ...@@ -314,7 +314,7 @@ handler *get_new_handler(TABLE *table, MEM_ROOT *alloc, enum db_type db_type)
case DB_TYPE_EXAMPLE_DB: case DB_TYPE_EXAMPLE_DB:
return new (alloc) ha_example(table); return new (alloc) ha_example(table);
#endif #endif
#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__) #if defined(HAVE_ARCHIVE_DB)
case DB_TYPE_ARCHIVE_DB: case DB_TYPE_ARCHIVE_DB:
return new (alloc) ha_archive(table); return new (alloc) ha_archive(table);
#endif #endif
...@@ -513,7 +513,7 @@ int ha_panic(enum ha_panic_function flag) ...@@ -513,7 +513,7 @@ int ha_panic(enum ha_panic_function flag)
if (have_federated_db == SHOW_OPTION_YES) if (have_federated_db == SHOW_OPTION_YES)
error|= federated_db_end(); error|= federated_db_end();
#endif #endif
#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__) #if defined(HAVE_ARCHIVE_DB)
if (have_archive_db == SHOW_OPTION_YES) if (have_archive_db == SHOW_OPTION_YES)
error|= archive_db_end(); error|= archive_db_end();
#endif #endif
......
...@@ -6323,7 +6323,7 @@ static void mysql_init_variables(void) ...@@ -6323,7 +6323,7 @@ static void mysql_init_variables(void)
#else #else
have_example_db= SHOW_OPTION_NO; have_example_db= SHOW_OPTION_NO;
#endif #endif
#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__) #if defined(HAVE_ARCHIVE_DB)
have_archive_db= SHOW_OPTION_YES; have_archive_db= SHOW_OPTION_YES;
#else #else
have_archive_db= SHOW_OPTION_NO; have_archive_db= SHOW_OPTION_NO;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment