bk commit into 5.0 tree (jimw:1.2015)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2015 06/01/05 10:27:06 jimw@stripped +1 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-15185
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  sql/handler.cc
    1.208 06/01/05 10:27:02 jimw@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.207/sql/handler.cc	2005-12-14 15:00:58 -08:00
+++ 1.208/sql/handler.cc	2006-01-05 10:27:02 -08:00
@@ -60,7 +60,7 @@
   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
@@ -321,7 +321,7 @@
       return new (alloc) ha_example(table);
     return NULL;
 #endif
-#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)
+#if defined(HAVE_ARCHIVE_DB)
   case DB_TYPE_ARCHIVE_DB:
     if (have_archive_db == SHOW_OPTION_YES)
       return new (alloc) ha_archive(table);
@@ -528,7 +528,7 @@
   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