bk commit into 5.1 tree (kent:1.2513)

[kent]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2007-03-22 16:58:46+01:00, kent@kent-amd64.(none) +4 -0
  Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
  into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
  MERGE: 1.1810.2373.172

  BUILD/check-cpu@stripped, 2007-03-22 16:58:43+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.13.1.8

  BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2007-03-22 16:58:43+01:00,
kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.1.9.2

  BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2007-03-22 16:58:43+01:00,
kent@kent-amd64.(none) +0 -0
    Merge rename: CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~1

  BitKeeper/deleted/.del-CMakeLists.txt~14@stripped, 2007-03-22 16:58:43+01:00,
kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.1.4.2

  BitKeeper/deleted/.del-CMakeLists.txt~14@stripped, 2007-03-22 16:58:43+01:00,
kent@kent-amd64.(none) +0 -0
    Merge rename: mysys/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~14

  extra/yassl/taocrypt/benchmark/Makefile.am@stripped, 2007-03-22 16:58:43+01:00,
kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.2.1.4

# 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:	kent-amd64.(none)
# Root:	/home/kent/bk/tmp/mysql-5.1-build/RESYNC

--- 1.1.9.1/CMakeLists.txt	2007-03-22 16:58:51 +01:00
+++ 1.9/BitKeeper/deleted/.del-CMakeLists.txt~1	2007-03-22 16:58:51 +01:00
@@ -44,6 +44,8 @@
 ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)
 
 IF(WITH_INNOBASE_STORAGE_ENGINE)
+  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/innobase/ib_config.h.in
+               ${CMAKE_SOURCE_DIR}/innobase/ib_config.h @ONLY)
   ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)
   ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)
   SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")
@@ -144,12 +146,8 @@
 ADD_SUBDIRECTORY(myisam)
 ADD_SUBDIRECTORY(myisammrg)
 ADD_SUBDIRECTORY(client)
-IF(WITH_BERKELEY_STORAGE_ENGINE)
-  ADD_SUBDIRECTORY(bdb)
-ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
-IF(WITH_INNOBASE_STORAGE_ENGINE)
-  ADD_SUBDIRECTORY(innobase)
-ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
+ADD_SUBDIRECTORY(bdb)
+ADD_SUBDIRECTORY(innobase)
 ADD_SUBDIRECTORY(sql)
 ADD_SUBDIRECTORY(sql/examples)
 ADD_SUBDIRECTORY(server-tools/instance-manager)

--- 1.6/extra/yassl/taocrypt/benchmark/Makefile.am	2007-03-22 16:58:51 +01:00
+++ 1.7/extra/yassl/taocrypt/benchmark/Makefile.am	2007-03-22 16:58:51 +01:00
@@ -1,5 +1,5 @@
 INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL
-bin_PROGRAMS       = benchmark
+noinst_PROGRAMS    = benchmark
 benchmark_SOURCES  = benchmark.cpp
 benchmark_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
 benchmark_CXXFLAGS = -DYASSL_PURE_C