3127 Magnus Blåudd 2010-11-17 [merge]
Merge 7.0 -> 5.5-telco-7.0
removed:
storage/ndb/config/type_ndbapi.cmake
modified:
storage/ndb/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/cw/cpcd/CMakeLists.txt
storage/ndb/src/ndbapi/CMakeLists.txt
storage/ndb/test/run-test/CMakeLists.txt
3126 Magnus Blåudd 2010-11-17 [merge]
Merge 7.0 -> 5.5-telco-7.0
modified:
storage/ndb/src/common/portlib/NdbThread.c
3125 Magnus Blåudd 2010-11-17 [merge]
Merge 7.0 -> 5.5-telco-7.0
modified:
storage/ndb/include/portlib/NdbDir.hpp
storage/ndb/src/common/portlib/ndb_daemon.cc
3124 Magnus Blåudd 2010-11-17 [merge]
Merge 7.0 -> 5.5-telco-7.0
modified:
storage/ndb/include/util/ndb_opts.h
storage/ndb/src/common/util/ndb_opts.c
storage/ndb/src/kernel/main.cpp
storage/ndb/test/run-test/setup.cpp
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt 2010-11-12 09:42:01 +0000
+++ b/storage/ndb/CMakeLists.txt 2010-11-17 11:35:04 +0000
@@ -40,6 +40,7 @@ ELSE()
${CMAKE_CURRENT_SOURCE_DIR}/include/mgmapi
${CMAKE_CURRENT_SOURCE_DIR}/include/mgmcommon
${CMAKE_CURRENT_SOURCE_DIR}/include/ndbapi
+ ${CMAKE_CURRENT_SOURCE_DIR}/include/logger
${CMAKE_CURRENT_BINARY_DIR}/include
# Util library includes
=== removed file 'storage/ndb/config/type_ndbapi.cmake'
--- a/storage/ndb/config/type_ndbapi.cmake 2008-08-20 13:22:09 +0000
+++ b/storage/ndb/config/type_ndbapi.cmake 1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-# Copyright (C) 2007 MySQL AB
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}/include
- ${CMAKE_BINARY_DIR}/storage/ndb/include
- ${CMAKE_SOURCE_DIR}/include
- ${CMAKE_SOURCE_DIR}/mysys
- ${CMAKE_SOURCE_DIR}/storage/ndb/include
- ${CMAKE_SOURCE_DIR}/storage/ndb/include/kernel
- ${CMAKE_SOURCE_DIR}/storage/ndb/include/transporter
- ${CMAKE_SOURCE_DIR}/storage/ndb/include/debugger
- ${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi
- ${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmcommon
- ${CMAKE_SOURCE_DIR}/storage/ndb/include/ndbapi
- ${CMAKE_SOURCE_DIR}/storage/ndb/include/util
- ${CMAKE_SOURCE_DIR}/storage/ndb/include/portlib
- ${CMAKE_SOURCE_DIR}/storage/ndb/include/logger)
=== modified file 'storage/ndb/include/portlib/NdbDir.hpp'
--- a/storage/ndb/include/portlib/NdbDir.hpp 2010-09-23 09:02:47 +0000
+++ b/storage/ndb/include/portlib/NdbDir.hpp 2010-11-17 10:37:58 +0000
@@ -16,9 +16,11 @@
#ifndef NdbDir_HPP
#define NdbDir_HPP
-#ifdef _WIN32
+#ifdef __WIN32
+#ifndef mode_t /* MySQL 5.5+ defines mode_t */
typedef int mode_t;
#endif
+#endif
class NdbDir {
public:
=== modified file 'storage/ndb/src/common/debugger/signaldata/CMakeLists.txt'
--- a/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt 2010-01-15 18:13:17 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt 2010-11-17 11:35:04 +0000
@@ -13,8 +13,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
ADD_LIBRARY(ndbsignaldata STATIC
AlterIndxImpl.cpp BuildIndxImpl.cpp BuildIndx.cpp
CreateIndxImpl.cpp CreateTab.cpp
=== modified file 'storage/ndb/src/common/logger/CMakeLists.txt'
--- a/storage/ndb/src/common/logger/CMakeLists.txt 2010-11-11 15:08:52 +0000
+++ b/storage/ndb/src/common/logger/CMakeLists.txt 2010-11-17 11:35:04 +0000
@@ -13,9 +13,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
-
ADD_LIBRARY(ndblogger STATIC
Logger.cpp
LogHandlerList.cpp
=== modified file 'storage/ndb/src/common/mgmcommon/CMakeLists.txt'
--- a/storage/ndb/src/common/mgmcommon/CMakeLists.txt 2008-08-20 13:22:09 +0000
+++ b/storage/ndb/src/common/mgmcommon/CMakeLists.txt 2010-11-17 11:35:04 +0000
@@ -16,7 +16,6 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi
${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmsrv)
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_mgmapiclient.cmake)
ADD_LIBRARY(ndbmgmsrv STATIC
=== modified file 'storage/ndb/src/common/portlib/NdbThread.c'
--- a/storage/ndb/src/common/portlib/NdbThread.c 2010-08-20 11:10:25 +0000
+++ b/storage/ndb/src/common/portlib/NdbThread.c 2010-11-17 10:59:04 +0000
@@ -472,7 +472,7 @@ NdbThread_LockCPU(struct NdbThread* pThr
return error_no;
}
-static pthread_key_t tls_keys[NDB_THREAD_TLS_MAX];
+static pthread_key(void*, tls_keys[NDB_THREAD_TLS_MAX]);
void *NdbThread_GetTlsKey(NDB_THREAD_TLS key)
{
=== modified file 'storage/ndb/src/common/portlib/ndb_daemon.cc'
--- a/storage/ndb/src/common/portlib/ndb_daemon.cc 2010-06-17 12:28:52 +0000
+++ b/storage/ndb/src/common/portlib/ndb_daemon.cc 2010-11-17 10:20:39 +0000
@@ -222,6 +222,8 @@ int ndb_daemon_init(int argc, char** arg
#ifdef _WIN32
+#include <sys/locking.h>
+
#define F_TLOCK _LK_NBLCK
#define F_ULOCK _LK_UNLCK
#define F_LOCK _LK_LOCK
=== modified file 'storage/ndb/src/cw/cpcd/CMakeLists.txt'
--- a/storage/ndb/src/cw/cpcd/CMakeLists.txt 2010-03-05 19:19:56 +0000
+++ b/storage/ndb/src/cw/cpcd/CMakeLists.txt 2010-11-17 11:35:04 +0000
@@ -14,7 +14,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbapi
${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi
${CMAKE_SOURCE_DIR}/storage/ndb/src/common/mgmcommon
=== modified file 'storage/ndb/src/ndbapi/CMakeLists.txt'
--- a/storage/ndb/src/ndbapi/CMakeLists.txt 2010-11-04 14:59:07 +0000
+++ b/storage/ndb/src/ndbapi/CMakeLists.txt 2010-11-17 11:35:04 +0000
@@ -13,9 +13,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi)
+INCLUDE_DIRECTORIES(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${NDB_SOURCE_DIR}/src/mgmapi)
ADD_LIBRARY(ndbapi STATIC
NdbEventOperation.cpp
=== modified file 'storage/ndb/test/run-test/CMakeLists.txt'
--- a/storage/ndb/test/run-test/CMakeLists.txt 2010-11-11 17:26:34 +0000
+++ b/storage/ndb/test/run-test/CMakeLists.txt 2010-11-17 11:35:04 +0000
@@ -14,7 +14,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/storage/ndb/include
No bundle (reason: useless for push emails).| Thread |
|---|
| • bzr push into mysql-5.5-telco-7.0 branch (magnus.blaudd:3124 to 3127) | Magnus Blåudd | 17 Nov |
