Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony 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-08-14 07:42:50-07:00, antony@stripped +52 -0
fixups for ndb on windows
CMakeLists.txt@stripped, 2007-08-14 07:42:32-07:00, antony@stripped +14 -12
some readyness for cross platform cmake
Makefile.am@stripped, 2007-08-14 07:42:32-07:00, antony@stripped +2 -1
include config.cmake in dist build
config.cmake@stripped, 2007-08-14 07:42:32-07:00, antony@stripped +2 -0
add config define for Windows
ndb/Makefile.am@stripped, 2007-08-14 07:42:33-07:00, antony@stripped +1 -1
include CMakeLists.txt in dist build
ndb/include/Makefile.am@stripped, 2007-08-14 07:42:33-07:00, antony@stripped +1 -1
include CMakeLists.txt in dist build
ndb/src/Makefile.am@stripped, 2007-08-14 07:42:33-07:00, antony@stripped +1 -0
include CMakeLists.txt in dist build
ndb/src/common/Makefile.am@stripped, 2007-08-14 07:42:33-07:00, antony@stripped +1 -0
include CMakeLists.txt in dist build
ndb/src/common/debugger/Makefile.am@stripped, 2007-08-14 07:42:33-07:00, antony@stripped +1 -0
include CMakeLists.txt in dist build
ndb/src/common/debugger/signaldata/Makefile.am@stripped, 2007-08-14 07:42:34-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/common/logger/Makefile.am@stripped, 2007-08-14 07:42:34-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/common/mgmcommon/Makefile.am@stripped, 2007-08-14 07:42:34-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/common/portlib/Makefile.am@stripped, 2007-08-14 07:42:34-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/common/portlib/NdbTCP.cpp@stripped, 2007-08-14 07:42:35-07:00, antony@stripped +1 -1
fix select arg
ndb/src/common/transporter/Makefile.am@stripped, 2007-08-14 07:42:35-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/common/util/Makefile.am@stripped, 2007-08-14 07:42:35-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/common/util/SocketServer.cpp@stripped, 2007-08-14 07:42:35-07:00, antony@stripped +16 -11
fix select processing
ndb/src/cw/util/SocketRegistry.cpp@stripped, 2007-08-14 07:42:35-07:00, antony@stripped +2 -1
fix select processing
ndb/src/kernel/Makefile.am@stripped, 2007-08-14 07:42:36-07:00, antony@stripped +1 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/Makefile.am@stripped, 2007-08-14 07:42:36-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/backup/Makefile.am@stripped, 2007-08-14 07:42:36-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/cmvmi/Makefile.am@stripped, 2007-08-14 07:42:36-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/dbacc/Makefile.am@stripped, 2007-08-14 07:42:37-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/dbdict/Makefile.am@stripped, 2007-08-14 07:42:37-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/dbdih/Makefile.am@stripped, 2007-08-14 07:42:37-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/dblqh/Makefile.am@stripped, 2007-08-14 07:42:37-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/dbtc/Makefile.am@stripped, 2007-08-14 07:42:37-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/dbtup/Makefile.am@stripped, 2007-08-14 07:42:38-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/dbtux/Makefile.am@stripped, 2007-08-14 07:42:38-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/dbutil/Makefile.am@stripped, 2007-08-14 07:42:38-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/ndbcntr/Makefile.am@stripped, 2007-08-14 07:42:38-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/ndbfs/Makefile.am@stripped, 2007-08-14 07:42:39-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/qmgr/Makefile.am@stripped, 2007-08-14 07:42:39-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/suma/Makefile.am@stripped, 2007-08-14 07:42:39-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/blocks/trix/Makefile.am@stripped, 2007-08-14 07:42:39-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/error/Makefile.am@stripped, 2007-08-14 07:42:40-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/kernel/vm/Makefile.am@stripped, 2007-08-14 07:42:40-07:00, antony@stripped +1 -0
include CMakeLists.txt in dist build
ndb/src/kernel/vm/TransporterCallback.cpp@stripped, 2007-08-14 07:42:40-07:00, antony@stripped +1 -0
zero value or else Visual Studio runtime will complain
about use of unset variables.
ndb/src/mgmapi/Makefile.am@stripped, 2007-08-14 07:42:40-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/mgmapi/mgmapi.cpp@stripped, 2007-08-14 07:42:40-07:00, antony@stripped +11 -9
add debugging
ndb/src/mgmclient/Makefile.am@stripped, 2007-08-14 07:42:41-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/mgmsrv/Makefile.am@stripped, 2007-08-14 07:42:41-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/src/ndbapi/Makefile.am@stripped, 2007-08-14 07:42:41-07:00, antony@stripped +1 -0
include CMakeLists.txt in dist build
ndb/test/Makefile.am@stripped, 2007-08-14 07:42:41-07:00, antony@stripped +1 -1
include CMakeLists.txt in dist build
ndb/test/ndbapi/Makefile.am@stripped, 2007-08-14 07:42:41-07:00, antony@stripped +1 -0
include CMakeLists.txt in dist build
ndb/test/ndbapi/bank/Makefile.am@stripped, 2007-08-14 07:42:42-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/test/ndbapi/flexBench.cpp@stripped, 2007-08-14 07:42:42-07:00, antony@stripped +4 -4
use socket_errno
ndb/test/ndbapi/flex_bench_mysql.cpp@stripped, 2007-08-14 07:42:42-07:00, antony@stripped +1 -1
use send() for network I/O
ndb/test/ndbapi/old_dirs/flexBench/Makefile.am@stripped, 2007-08-14 07:42:42-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/test/ndbapi/testMgm.cpp@stripped, 2007-08-14 07:42:42-07:00, antony@stripped +1 -1
use send() for network I/O
ndb/test/src/Makefile.am@stripped, 2007-08-14 07:42:43-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/test/tools/Makefile.am@stripped, 2007-08-14 07:42:43-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
ndb/tools/Makefile.am@stripped, 2007-08-14 07:42:43-07:00, antony@stripped +2 -0
include CMakeLists.txt in dist build
# 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: antony
# Host: pcg5ppc.xiphis.org
# Root: /private/Network/Servers/anubis.xiphis.org/home/antony/work/ndb-5.0-2
--- 1.105/Makefile.am 2007-05-22 08:21:19 -07:00
+++ 1.106/Makefile.am 2007-08-14 07:42:32 -07:00
@@ -19,7 +19,8 @@ AUTOMAKE_OPTIONS = foreign
# These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
- README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
+ README COPYING EXCEPTIONS-CLIENT CMakeLists.txt \
+ config.cmake
SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
@readline_topdir@ sql-common scripts \
@thread_dirs@ pstack \
--- 1.2/config.cmake 2007-08-13 09:06:16 -07:00
+++ 1.3/config.cmake 2007-08-14 07:42:32 -07:00
@@ -73,6 +73,8 @@ SET(MYSQL_TCP_PORT "${MYSQL_TCP_PORT_DEF
SET(MYSQL_UNIX_ADDR "${MYSQL_UNIX_ADDR_DEFAULT}" CACHE STRING
"Path for PIPE connections")
+SET(__NT__ TRUE CACHE BOOL "Target for Windows NT operating systems")
+
SET(EMBED_MANIFESTS FALSE CACHE BOOL "Embed manifests")
SET(DISABLE_GRANT_OPTIONS FALSE CACHE BOOL "Disable grant options")
--- 1.17/CMakeLists.txt 2007-08-13 09:06:16 -07:00
+++ 1.18/CMakeLists.txt 2007-08-14 07:42:32 -07:00
@@ -90,9 +90,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/suppo
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-small.cnf.sh
${CMAKE_SOURCE_DIR}/support-files/my-small.ini @ONLY)
-IF(__NT__)
- ADD_DEFINITIONS(-D__NT__)
-ENDIF(__NT__)
# in some places we use DBUG_OFF
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF")
@@ -100,17 +97,21 @@ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CM
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DDBUG_OFF")
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
-IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
+IF(WIN32)
+ IF(__NT__)
+ ADD_DEFINITIONS(-D__NT__)
+ ENDIF(__NT__)
+ IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /wd4996")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /wd4996")
-ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
+ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
-IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
- CMAKE_GENERATOR MATCHES "Visual Studio 8")
+ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
+ CMAKE_GENERATOR MATCHES "Visual Studio 8")
# replace /MDd with /MTd
STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG_INIT
${CMAKE_CXX_FLAGS_DEBUG_INIT})
@@ -139,12 +140,12 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studi
${CMAKE_CXX_FLAGS_INIT})
STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT
${CMAKE_CXX_FLAGS_DEBUG_INIT})
-ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
- CMAKE_GENERATOR MATCHES "Visual Studio 8")
+ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
+ CMAKE_GENERATOR MATCHES "Visual Studio 8")
-ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")
+ ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")
-IF(EMBED_MANIFESTS)
+ IF(EMBED_MANIFESTS)
# Search for the Manifest tool. CMake will first search it's defaults
# (CMAKE_FRAMEWORK_PATH, CMAKE_APPBUNDLE_PATH, CMAKE_PROGRAM_PATH and
# the system PATH) followed by the listed paths which are the current
@@ -174,7 +175,8 @@ IF(EMBED_MANIFESTS)
ELSE(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
SET(PROCESSOR_ARCH "X86")
ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
-ENDIF(EMBED_MANIFESTS)
+ ENDIF(EMBED_MANIFESTS)
+ENDIF(WIN32)
ADD_SUBDIRECTORY(vio)
ADD_SUBDIRECTORY(dbug)
--- 1.16/ndb/src/common/portlib/NdbTCP.cpp 2007-08-13 09:06:18 -07:00
+++ 1.17/ndb/src/common/portlib/NdbTCP.cpp 2007-08-14 07:42:35 -07:00
@@ -109,7 +109,7 @@ int Ndb_check_socket_hup(NDB_SOCKET_TYPE
FD_SET(sock, &writefds);
FD_SET(sock, &errorfds);
- if(select(1, &readfds, &writefds, &errorfds, &tv)<0)
+ if(select(sock+1, &readfds, &writefds, &errorfds, &tv)<0)
return 1;
if(FD_ISSET(sock,&errorfds))
--- 1.21/ndb/src/common/util/SocketServer.cpp 2007-08-13 09:06:19 -07:00
+++ 1.22/ndb/src/common/util/SocketServer.cpp 2007-08-14 07:42:35 -07:00
@@ -173,31 +173,33 @@ SocketServer::setup(SocketServer::Servic
void
SocketServer::doAccept(){
fd_set readSet, exceptionSet;
+ DBUG_ENTER("SocketServer::doAccept");
FD_ZERO(&readSet);
FD_ZERO(&exceptionSet);
m_services.lock();
- int maxSock = -1;
+
+ if (!m_services.size()) {
+ m_services.unlock();
+ sleep(1);
+ DBUG_VOID_RETURN;
+ }
+
+ NDB_SOCKET_TYPE maxSock = 0;
for (unsigned i = 0; i < m_services.size(); i++){
const NDB_SOCKET_TYPE s = m_services[i].m_socket;
FD_SET(s, &readSet);
FD_SET(s, &exceptionSet);
- maxSock = (maxSock > s ? maxSock : s);
- }
-
- if (maxSock < 0)
- {
- /* nothing to do here, sleep for 1 second */
- sleep(1);
- m_services.unlock();
- return;
+ if (maxSock > s)
+ continue;
+ maxSock = s + 1;
}
struct timeval timeout;
timeout.tv_sec = 1;
timeout.tv_usec = 0;
- if(select(maxSock + 1, &readSet, 0, &exceptionSet, &timeout) > 0){
+ if(select(maxSock, &readSet, 0, &exceptionSet, &timeout) > 0){
for (unsigned i = 0; i < m_services.size(); i++){
ServiceInstance & si = m_services[i];
@@ -228,6 +230,7 @@ SocketServer::doAccept(){
}
}
m_services.unlock();
+ DBUG_VOID_RETURN;
}
extern "C"
@@ -267,6 +270,7 @@ SocketServer::stopServer(){
void
SocketServer::doRun(){
+ DBUG_ENTER("SocketServer::doRun");
while(!m_stopThread){
m_session_mutex.lock();
@@ -279,6 +283,7 @@ SocketServer::doRun(){
NdbSleep_MilliSleep(200);
}
}
+ DBUG_VOID_RETURN;
}
void
--- 1.2/ndb/src/cw/util/SocketRegistry.cpp 2006-12-23 11:04:14 -08:00
+++ 1.3/ndb/src/cw/util/SocketRegistry.cpp 2007-08-14 07:42:35 -07:00
@@ -164,7 +164,8 @@ SocketRegistry<T>::syncPerformReceive(ch
if(strcmp(sc->gethostname(), remotehost)==0) {
if(sc->isConnected()) {
FD_ZERO(&tcpReadset);
- reply = select(sc->getSocket(), &tcpReadset, 0, 0, &timeout);
+ FD_SET(sc->getSocket(), &tcpReadset);
+ reply = select(sc->getSocket()+1, &tcpReadset, 0, 0, &timeout);
if(reply > 0) {
return t->runSession(sc->getSocket(), t);
}
--- 1.16/ndb/src/kernel/vm/TransporterCallback.cpp 2007-08-09 01:26:08 -07:00
+++ 1.17/ndb/src/kernel/vm/TransporterCallback.cpp 2007-08-14 07:42:40 -07:00
@@ -233,6 +233,7 @@ execute(void * callbackObj,
bool ok = true;
Ptr<SectionSegment> secPtr[3];
+ bzero(secPtr, sizeof(secPtr));
switch(secCount){
case 3:
ok &= import(secPtr[2], ptr[2].p, ptr[2].sz);
--- 1.72/ndb/src/mgmapi/mgmapi.cpp 2007-02-22 10:33:58 -08:00
+++ 1.73/ndb/src/mgmapi/mgmapi.cpp 2007-08-14 07:42:40 -07:00
@@ -761,6 +761,7 @@ extern "C"
struct ndb_mgm_cluster_state *
ndb_mgm_get_status(NdbMgmHandle handle)
{
+ DBUG_ENTER("ndb_mgm_get_status");
SET_ERROR(handle, NDB_MGM_NO_ERROR, "Executing: ndb_mgm_get_status");
CHECK_HANDLE(handle, NULL);
CHECK_CONNECTED(handle, NULL);
@@ -775,16 +776,17 @@ ndb_mgm_get_status(NdbMgmHandle handle)
if(!in.gets(buf, sizeof(buf)))
{
SET_ERROR(handle, NDB_MGM_ILLEGAL_SERVER_REPLY, "Probably disconnected");
- return NULL;
+ DBUG_RETURN(NULL);
}
if(strcmp("node status\n", buf) != 0) {
SET_ERROR(handle, NDB_MGM_ILLEGAL_NODE_STATUS, buf);
- return NULL;
+ DBUG_PRINT("info", ("buffer = '%s'", buf));
+ DBUG_RETURN(NULL);
}
if(!in.gets(buf, sizeof(buf)))
{
SET_ERROR(handle, NDB_MGM_ILLEGAL_SERVER_REPLY, "Probably disconnected");
- return NULL;
+ DBUG_RETURN(NULL);
}
BaseString tmp(buf);
@@ -792,12 +794,12 @@ ndb_mgm_get_status(NdbMgmHandle handle)
tmp.split(split, ":");
if(split.size() != 2){
SET_ERROR(handle, NDB_MGM_ILLEGAL_NODE_STATUS, buf);
- return NULL;
+ DBUG_RETURN(NULL);
}
if(!(split[0].trim() == "nodes")){
SET_ERROR(handle, NDB_MGM_ILLEGAL_NODE_STATUS, buf);
- return NULL;
+ DBUG_RETURN(NULL);
}
const int noOfNodes = atoi(split[1].c_str());
@@ -810,7 +812,7 @@ ndb_mgm_get_status(NdbMgmHandle handle)
{
SET_ERROR(handle, NDB_MGM_OUT_OF_MEMORY,
"Allocating ndb_mgm_cluster_state");
- return NULL;
+ DBUG_RETURN(NULL);
}
state->no_of_nodes= noOfNodes;
@@ -827,7 +829,7 @@ ndb_mgm_get_status(NdbMgmHandle handle)
free(state);
SET_ERROR(handle, NDB_MGM_ILLEGAL_SERVER_REPLY,
"Probably disconnected");
- return NULL;
+ DBUG_RETURN(NULL);
}
tmp.assign(buf);
@@ -858,12 +860,12 @@ ndb_mgm_get_status(NdbMgmHandle handle)
if(i+1 != noOfNodes){
free(state);
SET_ERROR(handle, NDB_MGM_ILLEGAL_NODE_STATUS, "Node count mismatch");
- return NULL;
+ DBUG_RETURN(NULL);
}
qsort(state->node_states, state->no_of_nodes, sizeof(state->node_states[0]),
cmp_state);
- return state;
+ DBUG_RETURN(state);
}
extern "C"
--- 1.12/ndb/test/ndbapi/flexBench.cpp 2006-12-23 11:04:19 -08:00
+++ 1.13/ndb/test/ndbapi/flexBench.cpp 2007-08-14 07:42:42 -07:00
@@ -165,7 +165,7 @@ statReport(enum StartType st, int ops)
nodeid = p == 0 ? 0 : atoi(p);
if ((statSock = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
if (statState != statError) {
- ndbout_c("stat: create socket failed: %s", strerror(errno));
+ ndbout_c("stat: create socket failed: %s", strerror(socket_errno));
statState = statError;
}
(void)NdbMutex_Unlock(&statMutex);
@@ -186,7 +186,7 @@ statReport(enum StartType st, int ops)
}
if (connect(statSock, (struct sockaddr *)&saddr, sizeof(saddr)) < 0) {
if (statState != statError) {
- ndbout_c("stat: connect failed: %s", strerror(errno));
+ ndbout_c("stat: connect failed: %s", strerror(socket_errno));
statState = statError;
}
(void)close(statSock);
@@ -224,9 +224,9 @@ statReport(enum StartType st, int ops)
sprintf(buf, "%d %s %d\n", nodeid, text, ops);
int len = strlen(buf);
// assume SIGPIPE already ignored
- if (write(statSock, buf, len) != len) {
+ if (send(statSock, buf, len, 0) != len) {
if (statState != statError) {
- ndbout_c("stat: write failed: %s", strerror(errno));
+ ndbout_c("stat: write failed: %s", strerror(socket_errno));
statState = statError;
}
(void)close(statSock);
--- 1.9/ndb/test/ndbapi/flex_bench_mysql.cpp 2006-12-23 11:04:19 -08:00
+++ 1.10/ndb/test/ndbapi/flex_bench_mysql.cpp 2007-08-14 07:42:42 -07:00
@@ -250,7 +250,7 @@ statReport(enum StartType st, int ops)
sprintf(buf, "%d %s %d\n", nodeid, text, ops);
int len = strlen(buf);
// assume SIGPIPE already ignored
- if (write(statSock, buf, len) != len) {
+ if (send(statSock, buf, len, 0) != len) {
if (statState != statError) {
ndbout_c("stat: write failed: %s", strerror(errno));
statState = statError;
--- 1.7/ndb/test/ndbapi/testMgm.cpp 2007-08-13 09:06:20 -07:00
+++ 1.8/ndb/test/ndbapi/testMgm.cpp 2007-08-14 07:42:42 -07:00
@@ -177,7 +177,7 @@ int runTestApiSession(NDBT_Context* ctx,
ndb_mgm_set_connectstring(h, mgm);
ndb_mgm_connect(h,0,0,0);
int s= ndb_mgm_get_fd(h);
- write(s,"get",3);
+ send(s,"get",3,0);
ndb_mgm_disconnect(h);
ndb_mgm_destroy_handle(&h);
/** NOTE: WE CANNOT REALLY TEST ANYTHING in 5.0
--- 1.16/ndb/Makefile.am 2006-12-30 15:18:20 -08:00
+++ 1.17/ndb/Makefile.am 2007-08-14 07:42:33 -07:00
@@ -15,7 +15,7 @@
SUBDIRS = src tools . include @ndb_opt_subdirs@
DIST_SUBDIRS = src tools include test docs
-EXTRA_DIST = config ndbapi-examples
+EXTRA_DIST = config ndbapi-examples CMakeLists.txt
include $(top_srcdir)/ndb/config/common.mk.am
--- 1.19/ndb/src/Makefile.am 2007-01-19 16:53:59 -08:00
+++ 1.20/ndb/src/Makefile.am 2007-08-14 07:42:33 -07:00
@@ -14,6 +14,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw
+EXTRA_DIST = CMakeLists.txt
include $(top_srcdir)/ndb/config/common.mk.am
--- 1.6/ndb/src/common/Makefile.am 2006-12-30 15:18:20 -08:00
+++ 1.7/ndb/src/common/Makefile.am 2007-08-14 07:42:33 -07:00
@@ -14,6 +14,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SUBDIRS = portlib debugger util logger transporter mgmcommon
+EXTRA_DIST = CMakeLists.txt
noinst_LTLIBRARIES = libcommon.la
--- 1.5/ndb/src/common/debugger/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.6/ndb/src/common/debugger/Makefile.am 2007-08-14 07:42:33 -07:00
@@ -14,6 +14,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SUBDIRS = signaldata
+EXTRA_DIST = CMakeLists.txt
noinst_LTLIBRARIES = libtrace.la
--- 1.7/ndb/src/common/debugger/signaldata/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.8/ndb/src/common/debugger/signaldata/Makefile.am 2007-08-14 07:42:34 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LTLIBRARIES = libsignaldataprint.la
libsignaldataprint_la_SOURCES = \
--- 1.4/ndb/src/common/logger/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.5/ndb/src/common/logger/Makefile.am 2007-08-14 07:42:34 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LTLIBRARIES = liblogger.la
SOURCE_WIN = Logger.cpp LogHandlerList.cpp LogHandler.cpp \
--- 1.11/ndb/src/common/mgmcommon/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.12/ndb/src/common/mgmcommon/Makefile.am 2007-08-14 07:42:34 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LTLIBRARIES = libmgmsrvcommon.la
libmgmsrvcommon_la_SOURCES = \
--- 1.12/ndb/src/common/portlib/Makefile.am 2006-12-30 15:18:20 -08:00
+++ 1.13/ndb/src/common/portlib/Makefile.am 2007-08-14 07:42:34 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LTLIBRARIES = libportlib.la
libportlib_la_SOURCES = \
--- 1.12/ndb/src/common/transporter/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.13/ndb/src/common/transporter/Makefile.am 2007-08-14 07:42:35 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LTLIBRARIES = libtransporter.la
libtransporter_la_SOURCES = \
--- 1.12/ndb/src/common/util/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.13/ndb/src/common/util/Makefile.am 2007-08-14 07:42:35 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LTLIBRARIES = libgeneral.la
libgeneral_la_SOURCES = \
--- 1.15/ndb/src/kernel/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.16/ndb/src/kernel/Makefile.am 2007-08-14 07:42:36 -07:00
@@ -14,6 +14,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SUBDIRS = error blocks vm
+EXTRA_DIST = CMakeLists.txt
include $(top_srcdir)/ndb/config/common.mk.am
--- 1.5/ndb/src/kernel/blocks/Makefile.am 2006-12-30 15:18:20 -08:00
+++ 1.6/ndb/src/kernel/blocks/Makefile.am 2007-08-14 07:42:36 -07:00
@@ -30,6 +30,8 @@ SUBDIRS = \
suma \
dbtux
+EXTRA_DIST = CMakeLists.txt
+
windoze-dsp:
# Don't update the files from bitkeeper
--- 1.5/ndb/src/kernel/blocks/backup/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.6/ndb/src/kernel/blocks/backup/Makefile.am 2007-08-14 07:42:36 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libbackup.a
libbackup_a_SOURCES = Backup.cpp BackupInit.cpp
--- 1.4/ndb/src/kernel/blocks/cmvmi/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.5/ndb/src/kernel/blocks/cmvmi/Makefile.am 2007-08-14 07:42:36 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libcmvmi.a
libcmvmi_a_SOURCES = Cmvmi.cpp
--- 1.6/ndb/src/kernel/blocks/dbacc/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.7/ndb/src/kernel/blocks/dbacc/Makefile.am 2007-08-14 07:42:37 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libdbacc.a
libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp
--- 1.5/ndb/src/kernel/blocks/dbdict/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.6/ndb/src/kernel/blocks/dbdict/Makefile.am 2007-08-14 07:42:37 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libdbdict.a
EXTRA_PROGRAMS = printSchemaFile
--- 1.5/ndb/src/kernel/blocks/dbdih/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.6/ndb/src/kernel/blocks/dbdih/Makefile.am 2007-08-14 07:42:37 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libdbdih.a
EXTRA_PROGRAMS = ndbd_sysfile_reader
--- 1.5/ndb/src/kernel/blocks/dblqh/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.6/ndb/src/kernel/blocks/dblqh/Makefile.am 2007-08-14 07:42:37 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libdblqh.a
EXTRA_PROGRAMS = ndbd_redo_log_reader
--- 1.4/ndb/src/kernel/blocks/dbtc/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.5/ndb/src/kernel/blocks/dbtc/Makefile.am 2007-08-14 07:42:37 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libdbtc.a
libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp
--- 1.5/ndb/src/kernel/blocks/dbtup/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.6/ndb/src/kernel/blocks/dbtup/Makefile.am 2007-08-14 07:42:38 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libdbtup.a
libdbtup_a_SOURCES = \
--- 1.6/ndb/src/kernel/blocks/dbtux/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.7/ndb/src/kernel/blocks/dbtux/Makefile.am 2007-08-14 07:42:38 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libdbtux.a
libdbtux_a_SOURCES = \
--- 1.4/ndb/src/kernel/blocks/dbutil/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.5/ndb/src/kernel/blocks/dbutil/Makefile.am 2007-08-14 07:42:38 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libdbutil.a
libdbutil_a_SOURCES = DbUtil.cpp
--- 1.4/ndb/src/kernel/blocks/ndbcntr/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.5/ndb/src/kernel/blocks/ndbcntr/Makefile.am 2007-08-14 07:42:38 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libndbcntr.a
libndbcntr_a_SOURCES = \
--- 1.4/ndb/src/kernel/blocks/ndbfs/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.5/ndb/src/kernel/blocks/ndbfs/Makefile.am 2007-08-14 07:42:39 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libndbfs.a
libndbfs_a_SOURCES = \
--- 1.4/ndb/src/kernel/blocks/qmgr/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.5/ndb/src/kernel/blocks/qmgr/Makefile.am 2007-08-14 07:42:39 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libqmgr.a
libqmgr_a_SOURCES = \
--- 1.5/ndb/src/kernel/blocks/suma/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.6/ndb/src/kernel/blocks/suma/Makefile.am 2007-08-14 07:42:39 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libsuma.a
libsuma_a_SOURCES = Suma.cpp SumaInit.cpp
--- 1.4/ndb/src/kernel/blocks/trix/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.5/ndb/src/kernel/blocks/trix/Makefile.am 2007-08-14 07:42:39 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libtrix.a
libtrix_a_SOURCES = Trix.cpp
--- 1.6/ndb/src/kernel/error/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.7/ndb/src/kernel/error/Makefile.am 2007-08-14 07:42:40 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = liberror.a
liberror_a_SOURCES = TimeModule.cpp \
--- 1.9/ndb/src/kernel/vm/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.10/ndb/src/kernel/vm/Makefile.am 2007-08-14 07:42:40 -07:00
@@ -17,6 +17,7 @@
#ifneq ($(USE_EDITLINE), N)
#DIRS += testLongSig
#endif
+EXTRA_DIST = CMakeLists.txt
noinst_LIBRARIES = libkernel.a
--- 1.14/ndb/src/mgmapi/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.15/ndb/src/mgmapi/Makefile.am 2007-08-14 07:42:40 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LTLIBRARIES = libmgmapi.la
libmgmapi_la_SOURCES = mgmapi.cpp ndb_logevent.cpp mgmapi_configuration.cpp LocalConfig.cpp ../kernel/error/ndbd_exit_codes.c
--- 1.18/ndb/src/mgmclient/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.19/ndb/src/mgmclient/Makefile.am 2007-08-14 07:42:41 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LTLIBRARIES = libndbmgmclient.la
ndbtools_PROGRAMS = ndb_mgm
--- 1.24/ndb/src/mgmsrv/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.25/ndb/src/mgmsrv/Makefile.am 2007-08-14 07:42:41 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix)
--- 1.17/ndb/src/ndbapi/Makefile.am 2007-04-11 06:21:08 -07:00
+++ 1.18/ndb/src/ndbapi/Makefile.am 2007-08-14 07:42:41 -07:00
@@ -14,6 +14,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#SUBDIRS = signal-sender
+EXTRA_DIST = CMakeLists.txt
noinst_LTLIBRARIES = libndbapi.la
--- 1.7/ndb/test/Makefile.am 2006-12-30 15:18:20 -08:00
+++ 1.8/ndb/test/Makefile.am 2007-08-14 07:42:41 -07:00
@@ -15,7 +15,7 @@
SUBDIRS = src tools ndbapi run-test
-EXTRA_DIST = include
+EXTRA_DIST = include CMakeLists.txt
dist-hook:
-rm -rf `find $(distdir) -type d -name SCCS`
--- 1.29/ndb/test/ndbapi/Makefile.am 2007-02-28 23:13:31 -08:00
+++ 1.30/ndb/test/ndbapi/Makefile.am 2007-08-14 07:42:41 -07:00
@@ -14,6 +14,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SUBDIRS = bank
+EXTRA_DIST = CMakeLists.txt
ndbtest_PROGRAMS = \
flexBench \
--- 1.6/ndb/test/ndbapi/bank/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.7/ndb/test/ndbapi/bank/Makefile.am 2007-08-14 07:42:42 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
ndbtest_PROGRAMS = testBank bankSumAccounts bankValidateAllGLs bankMakeGL bankTransactionMaker bankCreator bankTimer
noinst_LIBRARIES = libbank.a
--- 1.2/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am 2004-05-26 04:38:59 -07:00
+++ 1.3/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am 2007-08-14 07:42:42 -07:00
@@ -1,4 +1,6 @@
+EXTRA_DIST = CMakeLists.txt
+
bin_PROGRAMS = flexBench
flexBench_SOURCES = flexBench.cpp
--- 1.9/ndb/test/src/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.10/ndb/test/src/Makefile.am 2007-08-14 07:42:43 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES = libNDBT.a
libNDBT_a_SOURCES = \
--- 1.12/ndb/test/tools/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.13/ndb/test/tools/Makefile.am 2007-08-14 07:42:43 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
ndbtest_PROGRAMS = hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index ndb_cpcc
# transproxy
--- 1.27/ndb/tools/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.28/ndb/tools/Makefile.am 2007-08-14 07:42:43 -07:00
@@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+EXTRA_DIST = CMakeLists.txt
+
dist_bin_SCRIPTS = ndb_size.pl ndb_error_reporter
dist_pkgdata_DATA = ndb_size.tmpl
--- 1.19/ndb/include/Makefile.am 2006-12-30 13:07:31 -08:00
+++ 1.20/ndb/include/Makefile.am 2007-08-14 07:42:33 -07:00
@@ -54,7 +54,7 @@ ndb_global.h \
ndb_net.h
EXTRA_DIST = debugger editline kernel logger mgmcommon \
-portlib transporter util
+portlib transporter util CMakeLists.txt
dist-hook:
-rm -rf `find $(distdir) -type d -name SCCS`
| Thread |
|---|
| • bk commit into 5.0 tree (antony:1.2491) | antony | 14 Aug |
