bk commit into 5.1 tree (joerg:1.2341)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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@stripped, 2006-09-22 17:24:06+02:00, joerg@trift2. +10 -0
  Merge trift2.:/MySQL/M50/mysql-5.0
  into  trift2.:/MySQL/M51/push-5.1
  MERGE: 1.1810.1697.157

  BitKeeper/deleted/.del-CMakeLists.txt~7@stripped, 2006-09-22 17:23:58+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.1.1.2

  BitKeeper/deleted/.del-CMakeLists.txt~7@stripped, 2006-09-22 17:23:57+02:00, joerg@trift2. +0 -0
    Merge rename: client/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~7

  Docs/Makefile.am@stripped, 2006-09-22 17:23:58+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.57.1.1

  configure.in@stripped, 2006-09-22 17:23:57+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.245.1.153

  sql/mysqld.cc@stripped, 2006-09-22 17:23:58+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.439.1.134

  sql/opt_range.cc@stripped, 2006-09-22 17:23:58+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.159.1.67

  sql/sql_base.cc@stripped, 2006-09-22 17:23:59+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.235.1.117

  sql/sql_parse.cc@stripped, 2006-09-22 17:23:59+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.426.1.150

  sql/sql_select.cc@stripped, 2006-09-22 17:24:00+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.312.1.143

  sql/stacktrace.c@stripped, 2006-09-22 17:24:00+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.18.1.2

  sql/stacktrace.h@stripped, 2006-09-22 17:24:00+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.4.1.2

# 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:	joerg
# Host:	trift2.
# Root:	/MySQL/M51/push-5.1/RESYNC

--- 1.59/Docs/Makefile.am	2006-09-22 17:24:17 +02:00
+++ 1.60/Docs/Makefile.am	2006-09-22 17:24:17 +02:00
@@ -16,7 +16,7 @@
 
 noinst_SCRIPTS =	generate-text-files.pl
 
-EXTRA_DIST =		$(noinst_SCRIPTS) mysql.info INSTALL-BINARY
+EXTRA_DIST =		$(noinst_SCRIPTS) manual.chm mysql.info INSTALL-BINARY
 
 TXT_FILES=		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt

--- 1.384/configure.in	2006-09-22 17:24:17 +02:00
+++ 1.385/configure.in	2006-09-22 17:24:17 +02:00
@@ -1086,6 +1086,7 @@
     #
     echo -n "making sure specific build files are writable... "
     for file in \
+        Docs/manual.chm \
         Docs/mysql.info \
         Docs/INSTALL-BINARY \
         INSTALL-SOURCE \