bk commit into 5.0 tree (kent:1.2505)

[kent]

Below is the list of changes that have just been committed into a local
5.0 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-08-04 00:26:46+02:00, kent@stripped +1 -0
  CMakeLists.txt:
    Removed space between '-D' and symbol

  CMakeLists.txt@stripped, 2007-08-04 00:26:21+02:00, kent@stripped +14 -14
    Removed space between '-D' and symbol

diff -Nrup a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2007-08-03 21:42:27 +02:00
+++ b/CMakeLists.txt	2007-08-04 00:26:21 +02:00
@@ -22,8 +22,8 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/inclu
                ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)
 
 # Set standard options
-ADD_DEFINITIONS(-D CMAKE_BUILD)
-ADD_DEFINITIONS(-D HAVE_YASSL)
+ADD_DEFINITIONS(-DCMAKE_BUILD)
+ADD_DEFINITIONS(-DHAVE_YASSL)
 
 # Set debug options
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS")
@@ -31,27 +31,27 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_F
 # Note that some engines are always compiled in, MyISAM, MyISAMMRG, HEAP
 
 IF(WITH_ARCHIVE_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D HAVE_ARCHIVE_DB)
+  ADD_DEFINITIONS(-DHAVE_ARCHIVE_DB)
 ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
 
 IF(WITH_BERKELEY_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D HAVE_BERKELEY_DB)
+  ADD_DEFINITIONS(-DHAVE_BERKELEY_DB)
 ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
 
 IF (WITH_BLACKHOLE_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D HAVE_BLACKHOLE_DB)
+  ADD_DEFINITIONS(-DHAVE_BLACKHOLE_DB)
 ENDIF (WITH_BLACKHOLE_STORAGE_ENGINE)
 
 IF(WITH_EXAMPLE_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D HAVE_EXAMPLE_DB)
+  ADD_DEFINITIONS(-DHAVE_EXAMPLE_DB)
 ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
 
 IF(WITH_FEDERATED_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D HAVE_FEDERATED_DB)
+  ADD_DEFINITIONS(-DHAVE_FEDERATED_DB)
 ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
 
 IF(WITH_INNOBASE_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)
+  ADD_DEFINITIONS(-DHAVE_INNOBASE_DB)
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
 
 SET(localstatedir "C:\\mysql\\data")
@@ -67,14 +67,14 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/suppo
                ${CMAKE_SOURCE_DIR}/support-files/my-small.ini @ONLY)
 
 IF(__NT__)
-  ADD_DEFINITIONS(-D __NT__)
+  ADD_DEFINITIONS(-D__NT__)
 ENDIF(__NT__)
 
 # in some places we use DBUG_OFF
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D DBUG_OFF")
-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF")
-SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D DBUG_OFF")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
+SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DDBUG_OFF")
+SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
 
 IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
     SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")
@@ -112,7 +112,7 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studi
 ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
       CMAKE_GENERATOR MATCHES "Visual Studio 8")
 
-ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE")
+ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")
 
 IF(EMBED_MANIFESTS)
     # Search for the tools (mt, makecat, signtool) necessary for embedding