3369 magnus.blaudd@stripped 2011-06-22 [merge]
Merge 7.1 -> 5.5-cluster
modified:
storage/ndb/include/mgmapi/ndb_logevent.h
storage/ndb/include/ndb_types.h.in
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
3368 magnus.blaudd@stripped 2011-06-22 [merge]
Merge 7.1->5.5-cluster
modified:
storage/ndb/config/type_JAVA.cmake
3367 magnus.blaudd@stripped 2011-06-22 [merge]
Merge 7.1 -> 5.5-cluster
modified:
sql/ha_ndb_index_stat.cc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
storage/ndb/src/CMakeLists.txt
storage/ndb/src/common/debugger/CMakeLists.txt
storage/ndb/src/common/debugger/signaldata/CMakeLists.txt
storage/ndb/src/common/logger/CMakeLists.txt
storage/ndb/src/common/mgmcommon/CMakeLists.txt
storage/ndb/src/common/portlib/CMakeLists.txt
storage/ndb/src/common/transporter/CMakeLists.txt
storage/ndb/src/common/transporter/TransporterRegistry.cpp
storage/ndb/src/common/util/CMakeLists.txt
storage/ndb/src/kernel/CMakeLists.txt
storage/ndb/src/mgmapi/CMakeLists.txt
storage/ndb/src/mgmsrv/CMakeLists.txt
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
storage/ndb/src/ndbapi/CMakeLists.txt
storage/ndb/src/ndbjtie/mysql/CMakeLists.txt
storage/ndb/test/ndbapi/testBasic.cpp
storage/ndb/tools/ndb_dump_frm_data.cpp
=== 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:23:35 +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,22 +122,37 @@ 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} .)
+ # Concatenate the ARG_CLASSSPATH(a list of strings) into a string
+ # with platform specific separator
+ SET(separator) # Empty separator to start with
+ SET(classpath_str)
+ FOREACH(item ${ARG_CLASSPATH})
+ SET(classpath_str ${classpath_str}${separator}${item})
+ IF (WIN32)
+ SET(separator ";")
+ ELSE()
+ SET(separator ":")
+ ENDIF()
+ ENDFOREACH()
+ # MESSAGE(STATUS "classpath_str: ${classpath_str}")
+
+
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 ${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 ${JAVA_RUNTIME} -classpath "${ARG_CLASSPATH};${WITH_CLASSPATH}" ${ENHANCER} -p ${ARG_ENHANCE} -d ${TARGET_DIR}
+ COMMAND echo \"${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${classpath_str} ${JAVA_FILES}\"
+ COMMAND ${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${classpath_str} ${JAVA_FILES}
+ COMMAND echo \"${JAVA_RUNTIME} -classpath ${classpath_str}${separator}${WITH_CLASSPATH} ${ENHANCER} -p ${ARG_ENHANCE} -d ${TARGET_DIR}\"
+ COMMAND ${JAVA_RUNTIME} -classpath "${classpath_str}${separator}${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 ${JAVA_COMPILE} -d ${TARGET_DIR} -classpath "${ARG_CLASSPATH}" ${JAVA_FILES}
+ COMMAND echo \"${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${classpath_str} ${JAVA_FILES}\"
+ COMMAND ${JAVA_COMPILE} -d ${TARGET_DIR} -classpath "${classpath_str}" ${JAVA_FILES}
)
ENDIF()
=== modified file 'storage/ndb/include/mgmapi/ndb_logevent.h'
--- a/storage/ndb/include/mgmapi/ndb_logevent.h 2011-04-09 15:48:21 +0000
+++ b/storage/ndb/include/mgmapi/ndb_logevent.h 2011-06-22 08:04:19 +0000
@@ -371,6 +371,7 @@ extern "C" {
unsigned version;
};
struct ndb_logevent_STTORRYRecieved {
+ unsigned unused;
};
struct ndb_logevent_StartPhaseCompleted {
unsigned phase;
@@ -407,6 +408,7 @@ extern "C" {
unsigned extra;
};
struct ndb_logevent_NDBStopAborted {
+ unsigned _unused;
};
struct ndb_logevent_StartREDOLog {
unsigned node;
@@ -436,8 +438,10 @@ extern "C" {
/* NODERESTART */
struct ndb_logevent_NR_CopyDict {
+ unsigned _unused;
};
struct ndb_logevent_NR_CopyDistr {
+ unsigned _unused;
};
struct ndb_logevent_NR_CopyFragsStarted {
unsigned dest_node;
@@ -475,10 +479,13 @@ extern "C" {
/* TODO */
};
struct ndb_logevent_GCP_TakeoverStarted {
+ unsigned _unused;
};
struct ndb_logevent_GCP_TakeoverCompleted {
+ unsigned _unused;
};
struct ndb_logevent_LCP_TakeoverStarted {
+ unsigned _unused;
};
struct ndb_logevent_LCP_TakeoverCompleted {
unsigned state;
@@ -561,6 +568,7 @@ extern "C" {
};
struct ndb_logevent_WarningEvent {
/* TODO */
+ unsigned _unused;
};
/* INFO */
@@ -572,6 +580,7 @@ extern "C" {
};
struct ndb_logevent_InfoEvent {
/* TODO */
+ unsigned _unused;
};
struct ndb_logevent_EventBufferStatus {
unsigned usage;
@@ -722,21 +731,21 @@ extern "C" {
unsigned objectid;
unsigned version;
unsigned type;
- unsigned node; // Node create object
+ unsigned node; /* Node create object */
};
struct ndb_logevent_AlterSchemaObject {
unsigned objectid;
unsigned version;
unsigned type;
- unsigned node; // Node create object
+ unsigned node; /* Node create object */
};
struct ndb_logevent_DropSchemaObject {
unsigned objectid;
unsigned version;
unsigned type;
- unsigned node; // Node create object
+ unsigned node; /* Node create object */
};
struct ndb_logevent_StartReadLCP {
=== modified file 'storage/ndb/include/ndb_types.h.in'
--- a/storage/ndb/include/ndb_types.h.in 2011-02-02 09:20:32 +0000
+++ b/storage/ndb/include/ndb_types.h.in 2011-06-22 09:32:00 +0000
@@ -47,15 +47,15 @@ typedef unsigned int Uint32;
#ifndef INT_MIN64
#define INT_MIN64 (~0x7FFFFFFFFFFFFFFFLL)
-#endif // !INT_MIN64
+#endif /* !INT_MIN64 */
#ifndef INT_MAX64
#define INT_MAX64 0x7FFFFFFFFFFFFFFFLL
-#endif // !INT_MAX64
+#endif /* !INT_MAX64 */
#ifndef UINT_MAX64
#define UINT_MAX64 0xFFFFFFFFFFFFFFFFLL
-#endif // !UINT_MAX64
+#endif /* !UINT_MAX64 */
typedef unsigned int UintR;
=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp 2011-06-21 15:08:34 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp 2011-06-22 09:32:00 +0000
@@ -881,8 +881,8 @@ MgmtSrvr::sendVersionReq(int v_nodeId,
ssig.set(ss, TestOrd::TraceAPI, QMGR,
GSN_API_VERSION_REQ, ApiVersionReq::SignalLength);
- NodeId nodeId;
- int do_send = 1;
+ NodeId nodeId = 0;
+ bool do_send = true;
while(true)
{
if (do_send)
@@ -898,7 +898,7 @@ MgmtSrvr::sendVersionReq(int v_nodeId,
return SEND_OR_RECEIVE_FAILED;
}
- do_send = 0;
+ do_send = false;
}
SimpleSignal *signal = ss.waitFor();
@@ -925,7 +925,7 @@ MgmtSrvr::sendVersionReq(int v_nodeId,
const NFCompleteRep * const rep =
CAST_CONSTPTR(NFCompleteRep, signal->getDataPtr());
if (rep->failedNodeId == nodeId)
- do_send = 1; // retry with other node
+ do_send = true; // retry with other node
continue;
}
@@ -933,7 +933,7 @@ MgmtSrvr::sendVersionReq(int v_nodeId,
const NodeFailRep * const rep =
CAST_CONSTPTR(NodeFailRep, signal->getDataPtr());
if (NdbNodeBitmask::get(rep->theNodes,nodeId))
- do_send = 1; // retry with other node
+ do_send = true; // retry with other node
continue;
}
case GSN_API_REGCONF:
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster branch (magnus.blaudd:3367 to 3369) | magnus.blaudd | 22 Jun |
