4263 magnus.blaudd@stripped 2011-06-27
ndb
- properly escape the semicolon(which is cmakes list
separator) when building the classpath
- use quotes when concatenating the classpath_str variable
modified:
storage/ndb/config/type_JAVA.cmake
4262 Jonas Oreland 2011-06-27 [merge]
ndb - merge 70 to 71
modified:
mysql-test/suite/funcs_1/r/ndb_views.result
sql/ha_ndb_index_stat.cc
storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
storage/ndb/test/ndbapi/testMgmd.cpp
=== modified file 'storage/ndb/config/type_JAVA.cmake'
--- a/storage/ndb/config/type_JAVA.cmake 2011-06-22 09:23:35 +0000
+++ b/storage/ndb/config/type_JAVA.cmake 2011-06-27 15:07:36 +0000
@@ -130,9 +130,10 @@ MACRO(CREATE_JAR)
SET(separator) # Empty separator to start with
SET(classpath_str)
FOREACH(item ${ARG_CLASSPATH})
- SET(classpath_str ${classpath_str}${separator}${item})
+ SET(classpath_str "${classpath_str}${separator}${item}")
IF (WIN32)
- SET(separator ";")
+ # Quote the semicolon since it's cmakes list separator
+ SET(separator "\;")
ELSE()
SET(separator ":")
ENDIF()
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4262 to 4263) | magnus.blaudd | 27 Jun |