bk commit into 5.1 tree (msvensson:1.2605)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-19 17:01:59+02:00, msvensson@stripped +2 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.1810.2809.24

  BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2007-04-19 17:01:56+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.1.13.2

  BitKeeper/deleted/.del-CMakeLists.txt~1@stripped, 2007-04-19 17:01:56+02:00, msvensson@stripped +0 -0
    Merge rename: CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~1

  client/mysql_upgrade.c@stripped, 2007-04-19 17:01:56+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.6.1.17

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.1-maint/RESYNC

--- 1.1.13.1/CMakeLists.txt	2007-04-19 17:01:18 +02:00
+++ 1.12/BitKeeper/deleted/.del-CMakeLists.txt~1	2007-04-19 17:01:56 +02: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")
@@ -142,12 +144,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.33/client/mysql_upgrade.c	2007-04-18 19:00:58 +02:00
+++ 1.34/client/mysql_upgrade.c	2007-04-19 17:01:56 +02:00
@@ -335,6 +335,10 @@ static int run_tool(char *tool_path, DYN
 
   va_end(args);
 
+#ifdef __WIN__
+  dynstr_append(&ds_cmdline, "\"");
+#endif
+
   DBUG_PRINT("info", ("Running: %s", ds_cmdline.str));
   ret= run_command(ds_cmdline.str, ds_res);
   DBUG_PRINT("exit", ("ret: %d", ret));
@@ -354,11 +358,11 @@ static my_bool get_full_path_to_executab
 {
   my_bool ret;
   DBUG_ENTER("get_full_path_to_executable");
-#ifdef WIN
-  ret= GetModuleFileName(NULL, path, FN_REFLEN) != 0;
+#ifdef __WIN__
+  ret= (GetModuleFileName(NULL, path, FN_REFLEN) == 0);
 #else
   /* my_readlink returns 0 if a symlink was read */
-  ret= my_readlink(path, "/proc/self/exe", MYF(0)) != 0;
+  ret= (my_readlink(path, "/proc/self/exe", MYF(0)) != 0);
   /* Might also want to try with /proc/$$/exe if the above fails */
 #endif
   DBUG_PRINT("exit", ("path: %s", path));
@@ -416,8 +420,7 @@ static void find_tool(char *tool_path, c
     DBUG_PRINT("enter", ("path: %s", path));
 
     /* Chop off last char(since it might be a /) */
-    size_t pos= max((strlen(path)-1), 0);
-    path[pos]= 0;
+    path[max((strlen(path)-1), 0)]= 0;
 
     /* Chop off last dir part */
     dirname_part(path, path);