summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mysql-test/mysql-test-run.sh9
-rw-r--r--mysql-test/ndb/ndbcluster.sh13
-rw-r--r--ndb/include/kernel/AttributeHeader.hpp1
-rw-r--r--ndb/include/ndb_global.h.in6
-rw-r--r--ndb/src/kernel/blocks/backup/BackupInit.cpp1
-rw-r--r--ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp1
-rw-r--r--ndb/src/kernel/blocks/dbdih/DbdihInit.cpp1
-rw-r--r--ndb/src/kernel/blocks/dblqh/DblqhInit.cpp1
-rw-r--r--ndb/src/kernel/blocks/dbtc/DbtcInit.cpp1
-rw-r--r--ndb/src/kernel/blocks/dbtup/DbtupGen.cpp1
-rw-r--r--ndb/src/kernel/blocks/dbtux/Dbtux.hpp1
-rw-r--r--ndb/src/kernel/blocks/grep/GrepInit.cpp1
-rw-r--r--ndb/src/kernel/blocks/suma/SumaInit.cpp1
-rw-r--r--ndb/src/kernel/vm/Emulator.cpp1
-rw-r--r--ndb/src/kernel/vm/SimulatedBlock.hpp1
-rw-r--r--ndb/src/mgmapi/mgmapi_configuration.cpp1
16 files changed, 21 insertions, 20 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index ec794373baf..83a13707cdc 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -241,6 +241,9 @@ USE_EMBEDDED_SERVER=""
RESULT_EXT=""
TEST_MODE="default"
+NDB_MGMD_EXTRA_OPTS=
+NDBD_EXTRA_OPTS=
+
while test $# -gt 0; do
case "$1" in
--embedded-server) USE_EMBEDDED_SERVER=1 USE_MANAGER=0 NO_SLAVE=1 ; \
@@ -261,6 +264,10 @@ while test $# -gt 0; do
--ndb-connectstring=*)
USE_NDBCLUSTER="--ndbcluster" ;
USE_RUNNING_NDBCLUSTER=`$ECHO "$1" | $SED -e "s;--ndb-connectstring=;;"` ;;
+ --ndb_mgmd-extra-opts=*)
+ NDB_MGMD_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndb_mgmd-extra-opts=;;"` ;;
+ --ndbd-extra-opts=*)
+ NDBD_EXTRA_OPTS=`$ECHO "$1" | $SED -e "s;--ndbd-extra-opts=;;"` ;;
--tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;;
--local-master)
MASTER_MYPORT=3306;
@@ -463,7 +470,7 @@ SMALL_SERVER="--key_buffer_size=1M --sort_buffer=256K --max_heap_table_size=1M"
export MASTER_MYPORT MASTER_MYPORT1 SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MASTER_MYSOCK1
NDBCLUSTER_BASE_PORT=`expr $NDBCLUSTER_PORT + 2`
-NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --port-base=$NDBCLUSTER_BASE_PORT --data-dir=$MYSQL_TEST_DIR/var"
+NDBCLUSTER_OPTS="--port=$NDBCLUSTER_PORT --port-base=$NDBCLUSTER_BASE_PORT --data-dir=$MYSQL_TEST_DIR/var --ndb_mgmd-extra-opts=\"$NDB_MGMD_EXTRA_OPTS\" --ndbd-extra-opts=\"$NDBD_EXTRA_OPTS\""
if [ x$SOURCE_DIST = x1 ] ; then
MY_BASEDIR=$MYSQL_TEST_DIR
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh
index 2d529f8fe0f..a86e482b2ab 100644
--- a/mysql-test/ndb/ndbcluster.sh
+++ b/mysql-test/ndb/ndbcluster.sh
@@ -58,6 +58,9 @@ ndb_con_op=105000
ndb_dmem=80M
ndb_imem=24M
+NDB_MGMD_EXTRA_OPTS=
+NDBD_EXTRA_OPTS=
+
while test $# -gt 0; do
case "$1" in
--test)
@@ -94,6 +97,12 @@ while test $# -gt 0; do
--port-base=*)
port_base=`echo "$1" | sed -e "s;--port-base=;;"`
;;
+ --ndb_mgmd-extra-opts=*)
+ NDB_MGMD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgmd-extra-opts=;;"`
+ ;;
+ --ndbd-extra-opts=*)
+ NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"`
+ ;;
-- ) shift; break ;;
--* ) $ECHO "Unrecognized option: $1"; exit 1 ;;
* ) break ;;
@@ -122,8 +131,8 @@ if [ ! -x "$exec_waiter" ]; then
fi
exec_mgmtclient="$exec_mgmtclient --no-defaults"
-exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults"
-exec_ndb="$exec_ndb --no-defaults"
+exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $NDB_MGMD_EXTRA_OPTS"
+exec_ndb="$exec_ndb --no-defaults $NDBD_EXTRA_OPTS"
exec_waiter="$exec_waiter --no-defaults"
ndb_host="localhost"
diff --git a/ndb/include/kernel/AttributeHeader.hpp b/ndb/include/kernel/AttributeHeader.hpp
index e3900b63fdc..4ff60aadfd8 100644
--- a/ndb/include/kernel/AttributeHeader.hpp
+++ b/ndb/include/kernel/AttributeHeader.hpp
@@ -17,7 +17,6 @@
#ifndef ATTRIBUTE_HEADER
#define ATTRIBUTE_HEADER
-#include <new>
/**
* @class AttributeHeader
* @brief Header passed in front of every attribute value in AttrInfo signal
diff --git a/ndb/include/ndb_global.h.in b/ndb/include/ndb_global.h.in
index dd1d1c05db8..43f90e1f8b5 100644
--- a/ndb/include/ndb_global.h.in
+++ b/ndb/include/ndb_global.h.in
@@ -115,10 +115,8 @@ static const char table_name_separator = '/';
#endif
#ifdef __cplusplus
-#include <new>
-#endif
-
-#ifdef __cplusplus
+inline void* operator new(size_t, void* __p) { return __p; }
+inline void* operator new[](size_t, void* __p) { return __p; }
extern "C" {
#endif
diff --git a/ndb/src/kernel/blocks/backup/BackupInit.cpp b/ndb/src/kernel/blocks/backup/BackupInit.cpp
index e0171c61eca..08fa089a9c0 100644
--- a/ndb/src/kernel/blocks/backup/BackupInit.cpp
+++ b/ndb/src/kernel/blocks/backup/BackupInit.cpp
@@ -22,7 +22,6 @@
//===========================================================================
#include "Backup.hpp"
-#include <new>
#include <Properties.hpp>
#include <Configuration.hpp>
diff --git a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
index ba7a77fa4a9..6e3876fe807 100644
--- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+++ b/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
@@ -39,7 +39,6 @@
#include <EventLogger.hpp>
#include <TimeQueue.hpp>
-#include <new>
#include <NdbSleep.h>
#include <SafeCounter.hpp>
diff --git a/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp b/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
index b823dbcd952..9a5efebc56e 100644
--- a/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
+++ b/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
@@ -18,7 +18,6 @@
#define DBDIH_C
#include "Dbdih.hpp"
#include <ndb_limits.h>
-#include <new>
#define DEBUG(x) { ndbout << "DIH::" << x << endl; }
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
index 2b62e907e7b..e39d0ca68a6 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
@@ -19,7 +19,6 @@
#define DBLQH_C
#include "Dblqh.hpp"
#include <ndb_limits.h>
-#include <new>
#define DEBUG(x) { ndbout << "LQH::" << x << endl; }
diff --git a/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp b/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
index 5c66ba776b0..59c8237f20a 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
@@ -20,7 +20,6 @@
#include <ndb_limits.h>
#include <Properties.hpp>
#include <Configuration.hpp>
-#include <new>
#define DEBUG(x) { ndbout << "TC::" << x << endl; }
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp b/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
index 0f0e6d61f41..0d7430e662d 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
@@ -31,7 +31,6 @@
#include <signaldata/TupKey.hpp>
#include <signaldata/DropTab.hpp>
-#include <new>
#define DEBUG(x) { ndbout << "TUP::" << x << endl; }
diff --git a/ndb/src/kernel/blocks/dbtux/Dbtux.hpp b/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
index 79da3af5de4..5c12472a0f7 100644
--- a/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
+++ b/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
@@ -17,7 +17,6 @@
#ifndef DBTUX_H
#define DBTUX_H
-#include <new>
#include <ndb_limits.h>
#include <SimulatedBlock.hpp>
#include <AttributeDescriptor.hpp>
diff --git a/ndb/src/kernel/blocks/grep/GrepInit.cpp b/ndb/src/kernel/blocks/grep/GrepInit.cpp
index 36855f86568..d764fb1f473 100644
--- a/ndb/src/kernel/blocks/grep/GrepInit.cpp
+++ b/ndb/src/kernel/blocks/grep/GrepInit.cpp
@@ -15,7 +15,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include "Grep.hpp"
-#include <new>
#include <Properties.hpp>
#include <Configuration.hpp>
diff --git a/ndb/src/kernel/blocks/suma/SumaInit.cpp b/ndb/src/kernel/blocks/suma/SumaInit.cpp
index 36217c313af..b5945db3811 100644
--- a/ndb/src/kernel/blocks/suma/SumaInit.cpp
+++ b/ndb/src/kernel/blocks/suma/SumaInit.cpp
@@ -16,7 +16,6 @@
#include "Suma.hpp"
-#include <new>
#include <Properties.hpp>
#include <Configuration.hpp>
diff --git a/ndb/src/kernel/vm/Emulator.cpp b/ndb/src/kernel/vm/Emulator.cpp
index adf3c438945..068610b6778 100644
--- a/ndb/src/kernel/vm/Emulator.cpp
+++ b/ndb/src/kernel/vm/Emulator.cpp
@@ -33,7 +33,6 @@
#include <NdbOut.hpp>
#include <NdbMutex.h>
#include <NdbSleep.h>
-#include <new>
extern "C" {
extern void (* ndb_new_handler)();
diff --git a/ndb/src/kernel/vm/SimulatedBlock.hpp b/ndb/src/kernel/vm/SimulatedBlock.hpp
index cff19734368..787d14ca5cb 100644
--- a/ndb/src/kernel/vm/SimulatedBlock.hpp
+++ b/ndb/src/kernel/vm/SimulatedBlock.hpp
@@ -36,7 +36,6 @@
#include <ErrorReporter.hpp>
#include <ErrorHandlingMacros.hpp>
-#include <new>
#include "DLList.hpp"
#include "ArrayPool.hpp"
#include "DLHashTable.hpp"
diff --git a/ndb/src/mgmapi/mgmapi_configuration.cpp b/ndb/src/mgmapi/mgmapi_configuration.cpp
index 7bac2d10b92..80ab428c05a 100644
--- a/ndb/src/mgmapi/mgmapi_configuration.cpp
+++ b/ndb/src/mgmapi/mgmapi_configuration.cpp
@@ -1,7 +1,6 @@
#include <ndb_types.h>
#include <mgmapi.h>
#include "mgmapi_configuration.hpp"
-#include <new>
ndb_mgm_configuration_iterator::ndb_mgm_configuration_iterator
(const ndb_mgm_configuration & conf, unsigned type_of_section)
View Lorry Controller Status