bk commit into 5.0 tree (georg:1.2237)

[georg]

Below is the list of changes that have just been committed into a local
5.0 repository of georg. When georg 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-08-08 11:05:15+02:00, georg@stripped +3 -0
  fixes for Winx64 build

  CMakeLists.txt@stripped, 2006-08-08 11:04:50+02:00, georg@stripped +3 -2
    added YASSL support (default)

  Makefile.am@stripped, 2006-08-08 11:04:50+02:00, georg@stripped +1 -1
    fix for broken pushbuild

  configure.in@stripped, 2006-08-08 11:04:50+02:00, georg@stripped +1 -1
    fix for broken pushbuild

# 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:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.0-cmake

--- 1.84/Makefile.am	2006-08-08 11:05:22 +02:00
+++ 1.85/Makefile.am	2006-08-08 11:05:22 +02:00
@@ -27,6 +27,7 @@
 			@sql_union_dirs@ scripts @man_dirs@ tests \
 			netware @libmysqld_dirs@ \
 			@bench_dirs@ support-files @tools_dirs@
+			win
 
 DIST_SUBDIRS =		. include @docs_dirs@ zlib \
 			@readline_topdir@ sql-common \
@@ -34,7 +35,6 @@
 			@sql_union_dirs@ scripts @man_dirs@ tests SSL\
 			BUILD netware os2 @libmysqld_dirs@ \
 			@bench_dirs@ support-files @tools_dirs@ \
-			win
 
 # Run these targets before any others, also make part of clean target,
 # to make sure we create new links after a clean.

--- 1.406/configure.in	2006-08-08 11:05:22 +02:00
+++ 1.407/configure.in	2006-08-08 11:05:22 +02:00
@@ -2827,7 +2827,7 @@
  cmd-line-utils/Makefile dnl
  cmd-line-utils/libedit/Makefile dnl
  zlib/Makefile dnl
- cmd-line-utils/readline/Makefile)
+ cmd-line-utils/readline/Makefile win/Makefile)
  AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
  AC_OUTPUT
 

--- 1.1/CMakeLists.txt	2006-08-08 11:05:22 +02:00
+++ 1.2/CMakeLists.txt	2006-08-08 11:05:22 +02:00
@@ -9,13 +9,14 @@
 # Set backwards compatibility for cmake downto version 2.2
 SET(CMAKE_BACKWARDS_COMPATIBILITY 2.2)
 
-ADD_DEFINITIONS(-D CMAKE_BUILD)
-
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
                ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)
 
 # Set standard options
 ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE)
+ADD_DEFINITIONS(-D CMAKE_BUILD)
+ADD_DEFINITIONS(-D HAVE_YASSL)
+
 SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisam_plugin")