From: jani
Date: December 13 2005 11:38pm
Subject: bk commit into 5.1 tree (jani:1.1964)
List-Archive: http://lists.mysql.com/commits/132
Message-Id: <20051213233818.E6D643E89B7@rhols221.adsl.netsonic.fi>

Below is the list of changes that have just been committed into a local
5.1 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.1964 05/12/14 01:38:10 jani@stripped +2 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

  sql/ha_archive.cc
    1.64 05/12/14 01:37:59 jani@stripped +0 -0
    SCCS merged

  mysql-test/r/ndb_read_multi_range.result
    1.5 05/12/14 01:36:09 jani@stripped +0 -1
    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:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.1-new/RESYNC

--- 1.63/sql/ha_archive.cc	2005-11-23 22:44:54 +02:00
+++ 1.64/sql/ha_archive.cc	2005-12-14 01:37:59 +02:00
@@ -20,6 +20,7 @@
 
 #include "mysql_priv.h"
 
+#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)
 #include "ha_archive.h"
 #include <my_dir.h>