bk commit into 5.0 tree (serg:1.2003)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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.2003 05/12/24 14:32:50 serg@stripped +4 -0
  remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source

  sql/mysqld.cc
    1.524 05/12/24 14:32:39 serg@stripped +1 -1
    remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source

  sql/handler.cc
    1.207 05/12/24 14:32:38 serg@stripped +3 -3
    remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source

  sql/ha_archive.cc
    1.63 05/12/24 14:32:38 serg@stripped +1 -1
    remove "defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)" unmaintainably scattered all over the source

  include/config-netware.h
    1.13 05/12/24 14:32:38 serg@stripped +2 -1
    put undef HAVE_ARCHIVE_DB where it belongs

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.206/sql/handler.cc	Wed Dec 14 01:08:41 2005
+++ 1.207/sql/handler.cc	Sat Dec 24 14:32:38 2005
@@ -60,7 +60,7 @@ handlerton example_hton = { "EXAMPLE", S
   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, M
   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

--- 1.523/sql/mysqld.cc	Wed Dec 14 13:09:36 2005
+++ 1.524/sql/mysqld.cc	Sat Dec 24 14:32:39 2005
@@ -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;

--- 1.62/sql/ha_archive.cc	Wed Dec 14 00:21:48 2005
+++ 1.63/sql/ha_archive.cc	Sat Dec 24 14:32:38 2005
@@ -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>
 

--- 1.12/include/config-netware.h	Sat Oct 29 00:36:53 2005
+++ 1.13/include/config-netware.h	Sat Dec 24 14:32:38 2005
@@ -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