Commit d66adc7a authored Oct 20, 2004 by unknown

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


mysql-test/ndb/ndbcluster.sh:
  Auto merged

parents ffd77c46 64a1a505

ndb/include/kernel/signaldata/DictTabInfo.hpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@
		offsetof(x, l) }

		#define DTIBREAK(x) \
		{ DictTabInfo::x, 0, SimpleProperties::InvalidValue, 0, 0 }
		{ DictTabInfo::x, 0, SimpleProperties::InvalidValue, 0, 0, 0 }

		class DictTabInfo {
		/**

ndb/src/common/portlib/NdbDaemon.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@ NdbDaemon_Make(const char* lockfile, const char* logfile, unsigned flags)
		int lockfd = -1, logfd = -1, n;
		char buf[64];

		(void)flags; // remove warning for unused parameter

		/* Check that we have write access to lock file */
		assert(lockfile != NULL);
		lockfd = open(lockfile, O_CREAT\|O_RDWR, 0644);

ndb/src/common/portlib/NdbMem.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ void* NdbMem_Allocate(size_t size)

		void* NdbMem_AllocateAlign(size_t size, size_t alignment)
		{
		(void)alignment; // remove warning for unused parameter
		/*
		return (void*)memalign(alignment, size);
		TEMP fix

ndb/src/common/portlib/NdbThread.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ struct NdbThread* NdbThread_Create(NDB_THREAD_FUNC *p_thread_func,
		int result;
		pthread_attr_t thread_attr;

		(void)thread_prio; // remove warning for unused parameter

		if (p_thread_func == NULL)
		return 0;

		@@ -109,6 +111,7 @@ int NdbThread_SetConcurrencyLevel(int level)
		#ifdef USE_PTHREAD_EXTRAS
		return pthread_setconcurrency(level);
		#else
		(void)level; // remove warning for unused parameter
		return 0;
		#endif
		}

ndb/src/common/transporter/TCP_Transporter.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -362,7 +362,7 @@ TCP_Transporter::doReceive() {
		// Select-function must return the socket for read
		// before this method is called
		// It reads the external TCP/IP interface once
		int size = receiveBuffer.sizeOfBuffer - receiveBuffer.sizeOfData;
		Uint32 size = receiveBuffer.sizeOfBuffer - receiveBuffer.sizeOfData;
		if(size > 0){
		const int nBytesRead = recv(theSocket,
		receiveBuffer.insertPtr,