From: magnus.blaudd
Date: June 22 2011 9:02am
Subject: bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:4256)
List-Archive: http://lists.mysql.com/commits/139661
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5868181818629029921=="

--===============5868181818629029921==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///data0/magnus/mysql/7.1/ based on revid:magnus.blaudd@stripped

 4256 magnus.blaudd@stripped	2011-06-22
      ndb
       - escape the echo command proerly to avoid executin parts of the
         echoed string

    modified:
      storage/ndb/config/type_JAVA.cmake
=== modified file 'storage/ndb/config/type_JAVA.cmake'
--- a/storage/ndb/config/type_JAVA.cmake	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/config/type_JAVA.cmake	2011-06-22 09:01:40 +0000
@@ -68,7 +68,7 @@ MACRO(ADD_FILES_TO_JAR TARGET)
     SET(CLASS_DIRS -C ${DIR} ${IT})
 
     ADD_CUSTOM_COMMAND( TARGET  ${TARGET}.jar POST_BUILD
-      COMMAND echo "${JAVA_ARCHIVE} ufv ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}-${JAVA_NDB_VERSION}.jar ${CLASS_DIRS}"
+      COMMAND echo \"${JAVA_ARCHIVE} ufv ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}-${JAVA_NDB_VERSION}.jar ${CLASS_DIRS}\"
       COMMAND ${JAVA_ARCHIVE} ufv ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}-${JAVA_NDB_VERSION}.jar ${CLASS_DIRS}
       COMMENT "adding ${CLASS_DIRS} to target ${TARGET}-${JAVA_NDB_VERSION}.jar")
 
@@ -88,7 +88,7 @@ MACRO(CREATE_JAR_FROM_CLASSES TARGET)
   SET_JAVA_NDB_VERSION()
 
   ADD_CUSTOM_TARGET( ${TARGET}.jar ALL
-      COMMAND echo "${JAVA_ARCHIVE} cfvm ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}-${JAVA_NDB_VERSION}.jar ${ARG_MANIFEST}"
+      COMMAND echo \"${JAVA_ARCHIVE} cfvm ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}-${JAVA_NDB_VERSION}.jar ${ARG_MANIFEST}\"
       COMMAND ${JAVA_ARCHIVE} cfvm ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}-${JAVA_NDB_VERSION}.jar ${ARG_MANIFEST} )
   FOREACH(DEP ${ARG_DEPENDENCIES})
     ADD_DEPENDENCIES(${TARGET}.jar ${DEP})
@@ -122,21 +122,21 @@ MACRO(CREATE_JAR)
   SET_JAVA_NDB_VERSION()
 
   ADD_CUSTOM_TARGET( ${TARGET}.jar ALL
-    COMMAND echo "${JAVA_ARCHIVE} cfv ${JAR_DIR}/${TARGET}-${JAVA_NDB_VERSION}.jar -C ${CLASS_DIR} ."
+    COMMAND echo \"${JAVA_ARCHIVE} cfv ${JAR_DIR}/${TARGET}-${JAVA_NDB_VERSION}.jar -C ${CLASS_DIR} .\"
     COMMAND ${JAVA_ARCHIVE} cfv ${JAR_DIR}/${TARGET}-${JAVA_NDB_VERSION}.jar -C ${CLASS_DIR} .)
 
   IF(EXISTS ${ARG_ENHANCE})
     MESSAGE(STATUS "enhancing ${TARGET}.jar")
     SET(ENHANCER org.apache.openjpa.enhance.PCEnhancer)
     ADD_CUSTOM_COMMAND( TARGET ${TARGET}.jar PRE_BUILD
-      COMMAND echo "${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${ARG_CLASSPATH} ${JAVA_FILES}"
+      COMMAND echo \"${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${ARG_CLASSPATH} ${JAVA_FILES}\"
       COMMAND ${JAVA_COMPILE} -d ${TARGET_DIR} -classpath "${ARG_CLASSPATH}" ${JAVA_FILES}
-      COMMAND echo "${JAVA_RUNTIME} -classpath ${ARG_CLASSPATH}:${WITH_CLASSPATH} ${ENHANCER} -p ${ARG_ENHANCE} -d ${TARGET_DIR}"
+      COMMAND echo \"${JAVA_RUNTIME} -classpath ${ARG_CLASSPATH}:${WITH_CLASSPATH} ${ENHANCER} -p ${ARG_ENHANCE} -d ${TARGET_DIR}\"
       COMMAND ${JAVA_RUNTIME} -classpath "${ARG_CLASSPATH};${WITH_CLASSPATH}" ${ENHANCER} -p ${ARG_ENHANCE} -d ${TARGET_DIR}
     )
   ELSE()
     ADD_CUSTOM_COMMAND( TARGET ${TARGET}.jar PRE_BUILD
-      COMMAND echo "${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${ARG_CLASSPATH} ${JAVA_FILES}"
+      COMMAND echo \"${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${ARG_CLASSPATH} ${JAVA_FILES}\"
       COMMAND ${JAVA_COMPILE} -d ${TARGET_DIR} -classpath "${ARG_CLASSPATH}" ${JAVA_FILES}
     )
   ENDIF()


--===============5868181818629029921==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   1seyodt8piwv7og7
# target_branch: file:///data0/magnus/mysql/7.1/
# testament_sha1: b1f9f01941d87bc9ae52722148dc17c2b67e1961
# timestamp: 2011-06-22 11:02:52 +0200
# source_branch: file:///data0/magnus/mysql/7.0/
# base_revision_id: magnus.blaudd@stripped\
#   oe2b2k81bxawv51h
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXnoe5MAAfvfgFAQVGP/93//
36S//9/6UASapKbN4k3QazgJJJojBMCMg01TNGjUGjQADRhNBkGSJN6TVH5NU/RGo0aNANAAAAAA
AkkaJoFMaaE1N6k0xDQ9IAMg0A0aAOaZGQyYIaMJgjTRoxA0yZGAAIJKE9SNMiabU9Q0AAaBoMgY
j0mmJoNIiw35oZvpg5jDQLp9kCOZr0L3ate3ZbVW9HeF2cQQSb6Lr7Dd19/izHUs0mR4F3VUyGZd
3WBn74ZG5HuLW0ElGTxZhmbJK4bnFw7OXTHr/kdPZqhi8BmPxSq/7iz4Q414/rIL0qBkWJE6GLE5
y866HdDUKUCc4hFJClv36Md8ai0XwWM/UIydNxQkUiimlfIPSKFpQOmoecfMMCcjyCaN8VqdBkSV
GSsB1AmeGt+XIvSN6ukIxjdQymQOCwR2G3vSEQjAtGwMaOk4nXpM+TNYjps5JJ6CWtS0xxq0XgYG
i80QgrakDVnAgK9SDAor5GLkNMYhfxbVQ0cC0KpX2xm5dcZ7taaEiPNWb5llZXrhXjmlmJyFJVQV
41mVWT7nnIcu3tRi7b5AUWiSi2yJzlesmBWHMgIjKTJKTpNvsfUJkBLxiFsinmBia+AdBp0lnIMx
e1SpNsha1tOcnqhqhepbhZ621rMvJjszzw3655KNV+InwLKK9ZRiycfPa0pG+PjvleO0r+G5pjA1
kBpsmmzlAnU24zVaOXAg3c5uOIjr9zAOS0LMLSjIY8gsoPBSJFi04c50hfVN2sZkwTBhxIgDIHAV
mfGSrB8WTILKa0Bo1lkJEiYZUIfKUELhnVAGi2rUzkjCTCsA41RND6AcSAitpDsgSVQE1cFCpYDJ
FCinW6gRZElUDieAxGwUpBgpCnOwkCoqlSR5/GjzCqWkz21Arldh32VoRxm294a69Oa5GBipgX/U
7e6DBeql8l6y8XfCmlIq2XoxoVM88UXyY/xTyioxKoQTniGOHStVv5jUnZrhMg0UW9Ii+y+aDYVG
Et8i8JqTx06tYFjvqWEiYJWe+tJVjkssr89MY3OOHUcW0GYIwBuWEqtBLNplxS3GL+1OBQPVTpdm
B3cu6HHlZ08zGRHES4gbp6IyjDTGaJGfd25Xt22OOa5udMrjC93FXdo1zEYXPjWUUOW3mvxrwhNW
BQbtPhhVAxvhyO48yijpFxgFqhLQcYkbPAnAeYXksmbemi2FIOKm2hLJ4W0vqDENm0UHJzqox0DK
9SvDNtvC6UOEzwlXMI2OSGJq8Mk08wjUWYzjnkqoqKWo0w0CKIssRBtMQBp2IG7WJzLgIct23gLF
ojvFTGnuzeUWeCxCmDg7U88UhAiJxzaUjfF10rkQowtFFhXeBfoOqUDAVAAk0ijFSKcNdTai18qW
Xn0kbSuBDq2ycIZAUmkLgEU7MeKxWRTUCvRB/AXFYox3FbW0OSagNp7VpplWixM0hloz8jPvWiKY
17rBHC5l3UFCS1hKOMYLMJ8lrJeJldn1sWuLYr+clR777Bqf5CXQvUdAMMvWvgop+mDD/8XckU4U
JB56HuTA


--===============5868181818629029921==--