From: kent
Date: December 14 2005 12:09pm
Subject: bk commit into 5.0 tree (kent:1.1975)
List-Archive: http://lists.mysql.com/commits/149
Message-Id: <20051214120959.044FE77B8B4@boortz.dyndns.org>

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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.1975 05/12/14 13:09:41 kent@stripped +1 -0
  Merge kboortz@stripped:/home/bk/mysql-5.0
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  sql/mysqld.cc
    1.523 05/12/14 13:09:36 kent@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:	kent
# Host:	c-664072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0/RESYNC

--- 1.522/sql/mysqld.cc	2005-12-08 16:15:24 +01:00
+++ 1.523/sql/mysqld.cc	2005-12-14 13:09:36 +01:00
@@ -6323,7 +6323,7 @@
 #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;