Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy 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-04-23 15:47:26-04:00, iggy@recycle.(none) +10 -0
Merge recycle.(none):/src/bug24732/my50-bug24732
into recycle.(none):/src/bug24732/my51-bug24732
MERGE: 1.1810.2855.8
BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Auto merged
MERGE: 1.1.14.2
BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2007-04-23 15:47:21-04:00, iggy@recycle.(none) +0 -0
Merge rename: CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~1
BitKeeper/deleted/.del-CMakeLists.txt~10@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Auto merged
MERGE: 1.1.4.2
BitKeeper/deleted/.del-CMakeLists.txt~10@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Merge rename: extra/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~10
BitKeeper/deleted/.del-CMakeLists.txt~13@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Auto merged
MERGE: 1.1.2.2
BitKeeper/deleted/.del-CMakeLists.txt~13@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Merge rename: libmysql/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~13
BitKeeper/deleted/.del-CMakeLists.txt~2@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Auto merged
MERGE: 1.1.2.2
BitKeeper/deleted/.del-CMakeLists.txt~2@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Merge rename: server-tools/instance-manager/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~2
BitKeeper/deleted/.del-CMakeLists.txt~3@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Auto merged
MERGE: 1.1.5.2
BitKeeper/deleted/.del-CMakeLists.txt~3@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Merge rename: sql/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~3
BitKeeper/deleted/.del-CMakeLists.txt~7@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Auto merged
MERGE: 1.1.6.2
BitKeeper/deleted/.del-CMakeLists.txt~7@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Merge rename: client/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~7
BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Auto merged
MERGE: 1.1.2.2
BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Merge rename: myisam/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740
BitKeeper/deleted/.del-README~1@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Auto merged
MERGE: 1.1.3.2
BitKeeper/deleted/.del-README~1@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Merge rename: win/README -> BitKeeper/deleted/.del-README~1
BitKeeper/deleted/.del-configure.js@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Auto merged
MERGE: 1.1.5.2
BitKeeper/deleted/.del-configure.js@stripped, 2007-04-23 15:47:22-04:00, iggy@recycle.(none) +0 -0
Merge rename: win/configure.js -> BitKeeper/deleted/.del-configure.js
BitKeeper/etc/ignore@stripped, 2007-04-23 15:47:18-04:00, iggy@recycle.(none) +2 -2
auto-union
MERGE: 1.210.1.37
# 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: iggy
# Host: recycle.(none)
# Root: /src/bug24732/my51-bug24732/RESYNC
--- 1.1.14.1/CMakeLists.txt 2007-04-23 15:41:22 -04:00
+++ 1.13/BitKeeper/deleted/.del-CMakeLists.txt~1 2007-04-23 15:47:22 -04:00
@@ -44,6 +44,8 @@ IF (WITH_MYISAMMRG_STORAGE_ENGINE)
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")
@@ -169,12 +171,8 @@ ADD_SUBDIRECTORY(heap)
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.288/BitKeeper/etc/ignore 2007-04-23 11:00:52 -04:00
+++ 1.289/BitKeeper/etc/ignore 2007-04-23 15:47:18 -04:00
@@ -5,7 +5,6 @@
*.bb
*.bbg
*.bin
-*.cmake
*.core
*.d
*.da
@@ -32,6 +31,7 @@
*.spec
*.user
*.vcproj
+*.vcproj.cmake
*/*.dir/*
*/*_pure_*warnings
*/.deps
@@ -394,6 +394,7 @@ client/tmp.diff
client_debug/*
client_release/*
client_test
+cmake_install.cmake
cmd-line-utils/libedit/.deps/chared.Po
cmd-line-utils/libedit/.deps/common.Po
cmd-line-utils/libedit/.deps/el.Po
| Thread |
|---|
| • bk commit into 5.1 tree (iggy:1.2576) | Ignacio Galarza | 23 Apr |
