List:Commits« Previous MessageNext Message »
From:jani Date:December 14 2005 12:08am
Subject:bk commit into 5.0 tree (jani:1.1984)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani 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.1984 05/12/14 02:08:48 jani@stripped +2 -0
  Disabled archive db for Netware.

  sql/mysqld.cc
    1.522 05/12/14 02:08:41 jani@stripped +1 -1
    Disabled archive db for Netware.

  sql/handler.cc
    1.206 05/12/14 02:08:41 jani@stripped +3 -3
    Disabled archive db for Netware.

# 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:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.0

--- 1.205/sql/handler.cc	2005-11-25 12:42:46 +02:00
+++ 1.206/sql/handler.cc	2005-12-14 02:08:41 +02:00
@@ -60,7 +60,7 @@
   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 @@
   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 @@
   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

--- 1.521/sql/mysqld.cc	2005-12-04 20:55:16 +02:00
+++ 1.522/sql/mysqld.cc	2005-12-14 02:08:41 +02: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;
Thread
bk commit into 5.0 tree (jani:1.1984)jani14 Dec