bk commit into 5.1 tree (cbell:1.2536)

[cbell]

Below is the list of changes that have just been committed into a local
5.1 repository of cbell. When cbell 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-06-13 14:38:04-04:00, cbell@mysql_cab_desk. +2 -0
  WL#3327 : Online Backup
  
  This patch modifies the Windows configure utility and cmake input
  files to allow the use of EXTRA_DEBUG defines on Windows.
  
  A typical debug build commandline call would take the form of: 
  
  win\configure WITH_INNOBASE_STORAGE_ENGINE 
  WITH_PARTITION_STORAGE_ENGINE 
  WITH_ARCHIVE_STORAGE_ENGINE 
  WITH_BLACKHOLE_STORAGE_ENGINE 
  WITH_EXAMPLE_STORAGE_ENGINE 
  WITH_FEDERATED_STORAGE_ENGINE 
  __NT__ 
  EXTRA_DEBUG 
  "COMPILATION_COMMENT=MySQL-new-rpl clone"
  
  cmake -G "Visual Studio 8 2005"
  

  CMakeLists.txt@stripped, 2007-06-13 14:37:54-04:00, cbell@mysql_cab_desk. +4 -0
    WL#3327 : Online Backup
    
    This patch adds the definition clause to the cmake input to allow
    using EXTRA_DEBUG defines on Windows.

  win/configure.js@stripped, 2007-06-13 14:37:55-04:00, cbell@mysql_cab_desk. +1 -0
    WL#3327 : Online Backup
    
    This patch adds a case to configuration file generator that allows
    using EXTRA_DEBUG defines on Windows.

# 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:	cbell
# Host:	mysql_cab_desk.
# Root:	C:/source/c++/mysql-5.1-open_tables

--- 1.25/CMakeLists.txt	2007-06-13 14:38:19 -04:00
+++ 1.26/CMakeLists.txt	2007-06-13 14:38:19 -04:00
@@ -87,6 +87,10 @@
   ADD_DEFINITIONS(-D CYBOZU)
 ENDIF(CYBOZU)
 
+IF(EXTRA_DEBUG)
+  ADD_DEFINITIONS(-D EXTRA_DEBUG)
+ENDIF(EXTRA_DEBUG)
+
 # in some places we use DBUG_OFF
 SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")
 SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF")

--- 1.6/win/configure.js	2007-06-13 14:38:19 -04:00
+++ 1.7/win/configure.js	2007-06-13 14:38:19 -04:00
@@ -45,6 +45,7 @@
             case "WITH_INNOBASE_STORAGE_ENGINE":
             case "WITH_PARTITION_STORAGE_ENGINE":
             case "__NT__":
+            case "EXTRA_DEBUG":
             case "CYBOZU":
                     configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
                     break;