From b7c52afb57d4ff625df3490040704d6e3181b34d Mon Sep 17 00:00:00 2001
From: "jani@a193-229-222-105.elisa-laajakaista.fi" <>
Date: Wed, 14 Dec 2005 02:08:48 +0200
Subject: [PATCH] Disabled archive db for Netware.

---
 sql/handler.cc | 6 +++---
 sql/mysqld.cc  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sql/handler.cc b/sql/handler.cc
index 477a6f9bdae..47010de3002 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
-#ifdef HAVE_ARCHIVE_DB
+#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)
 #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
-#ifdef HAVE_ARCHIVE_DB
+#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)
   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
-#ifdef HAVE_ARCHIVE_DB
+#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)
   if (have_archive_db == SHOW_OPTION_YES)
     error|= archive_db_end();
 #endif
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 8792d2560ae..cd0c2d736c2 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
-#ifdef HAVE_ARCHIVE_DB
+#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)
   have_archive_db= SHOW_OPTION_YES;
 #else
   have_archive_db= SHOW_OPTION_NO;