summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--acinclude.m45
-rw-r--r--configure.in9
-rw-r--r--mysql-test/ndb/ndb_config_2_node.ini12
-rw-r--r--mysql-test/t/ndb_blob.test8
-rw-r--r--ndb/config/type_ndbapitest.mk.am5
-rw-r--r--ndb/config/type_ndbapitools.mk.am6
-rw-r--r--ndb/include/ndb_global.h1
-rw-r--r--ndb/src/common/mgmcommon/ConfigInfo.cpp783
-rw-r--r--ndb/src/common/mgmcommon/ConfigInfo.hpp10
-rw-r--r--ndb/src/common/mgmcommon/InitConfigFileParser.cpp16
-rw-r--r--ndb/src/common/mgmcommon/InitConfigFileParser.hpp5
-rw-r--r--ndb/src/common/mgmcommon/LocalConfig.cpp2
-rw-r--r--ndb/src/common/mgmcommon/Makefile.am9
-rw-r--r--ndb/src/cw/cpcd/Makefile.am6
-rw-r--r--ndb/src/kernel/blocks/backup/restore/Makefile.am6
-rw-r--r--ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp4
-rw-r--r--ndb/src/mgmclient/CpcClient.cpp4
-rw-r--r--ndb/src/mgmsrv/Makefile.am4
-rw-r--r--ndb/src/mgmsrv/Services.cpp2
-rw-r--r--ndb/src/mgmsrv/main.cpp3
-rw-r--r--ndb/src/ndbapi/Ndb.cpp30
-rw-r--r--ndb/test/run-test/Makefile.am6
22 files changed, 506 insertions, 430 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 7c11462d290..cf9c8c0e3c5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1536,6 +1536,11 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
--with-ndb-docs Include the NDB Cluster ndbapi and mgmapi documentation],
[ndb_docs="$withval"],
[ndb_docs=no])
+ AC_ARG_WITH([ndb-port-base],
+ [
+ --with-ndb-port-base Base port for NDB Cluster],
+ [ndb_port_base="$withval"],
+ [ndb_port_base="default"])
AC_MSG_CHECKING([for NDB Cluster options])
AC_MSG_RESULT([])
diff --git a/configure.in b/configure.in
index d40cfbbae19..3bee418a270 100644
--- a/configure.in
+++ b/configure.in
@@ -389,8 +389,6 @@ then
# Disable exceptions as they seams to create problems with gcc and threads.
# mysqld doesn't use run-time-type-checking, so we disable it.
CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"
- # ndb cannot be compiled with -fno-implicit-templaces
- ndb_cxxflags_fix="$ndb_cxxflags_fix -fimplicit-templates"
# If you are using 'gcc' 3.0 (not g++) to compile C++ programs on Linux,
# we will gets some problems when linking static programs.
@@ -3020,6 +3018,13 @@ then
AC_SUBST([NDB_DEFS])
AC_SUBST([ndb_cxxflags_fix])
+
+if test X"$ndb_port_base" = Xdefault
+then
+ ndb_port_base="2200"
+fi
+AC_SUBST([ndb_port_base])
+
ndb_transporter_opt_objs=""
if test X"$have_ndb_shm" = Xyes
then
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini
index 7b3548ae303..a395b300df4 100644
--- a/mysql-test/ndb/ndb_config_2_node.ini
+++ b/mysql-test/ndb/ndb_config_2_node.ini
@@ -7,19 +7,11 @@ Diskless= CHOOSE_Diskless
TimeBetweenWatchDogCheck= 30000
FileSystemPath= CHOOSE_FILESYSTEM
-[computer]
-Id= 1
-HostName= CHOOSE_HOSTNAME_1
-
-[computer]
-Id= 2
-HostName= CHOOSE_HOSTNAME_2
-
[ndbd]
-ExecuteOnComputer= 1
+HostName: CHOOSE_HOSTNAME_1
[ndbd]
-ExecuteOnComputer= 2
+HostName: CHOOSE_HOSTNAME_2
[ndb_mgmd]
PortNumber= CHOOSE_PORT_MGM
diff --git a/mysql-test/t/ndb_blob.test b/mysql-test/t/ndb_blob.test
index d33168d9da6..3671c7fd07a 100644
--- a/mysql-test/t/ndb_blob.test
+++ b/mysql-test/t/ndb_blob.test
@@ -229,6 +229,14 @@ select * from test.t1,t2 where test.t1.a = t2.a order by test.t1.a;
drop table t2;
use test;
+# alter table
+
+select * from t1 order by a;
+alter table t1 add x int;
+select * from t1 order by a;
+alter table t1 drop x;
+select * from t1 order by a;
+
# range scan delete
delete from t1 where c >= 100;
commit;
diff --git a/ndb/config/type_ndbapitest.mk.am b/ndb/config/type_ndbapitest.mk.am
index 3132dd30f0b..8ac39aec8cf 100644
--- a/ndb/config/type_ndbapitest.mk.am
+++ b/ndb/config/type_ndbapitest.mk.am
@@ -1,6 +1,9 @@
LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \
- $(top_builddir)/ndb/src/libndbclient.la
+ $(top_builddir)/ndb/src/libndbclient.la \
+ $(top_builddir)/dbug/libdbug.a \
+ $(top_builddir)/mysys/libmysys.a \
+ $(top_builddir)/strings/libmystrings.a
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
-I$(top_srcdir)/ndb/include \
diff --git a/ndb/config/type_ndbapitools.mk.am b/ndb/config/type_ndbapitools.mk.am
index a8b511d3637..3b5d40874b2 100644
--- a/ndb/config/type_ndbapitools.mk.am
+++ b/ndb/config/type_ndbapitools.mk.am
@@ -1,5 +1,9 @@
-LDADD += $(top_builddir)/ndb/src/libndbclient.la
+LDADD += \
+ $(top_builddir)/ndb/src/libndbclient.la \
+ $(top_builddir)/dbug/libdbug.a \
+ $(top_builddir)/mysys/libmysys.a \
+ $(top_builddir)/strings/libmystrings.a
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
-I$(top_srcdir)/ndb/include \
diff --git a/ndb/include/ndb_global.h b/ndb/include/ndb_global.h
index 038950a7a32..68ea0943935 100644
--- a/ndb/include/ndb_global.h
+++ b/ndb/include/ndb_global.h
@@ -3,7 +3,6 @@
#define NDBGLOBAL_H
#include <my_global.h>
-#define NDB_BASE_PORT 2200
/** signal & SIG_PIPE */
#include <my_alarm.h>
diff --git a/ndb/src/common/mgmcommon/ConfigInfo.cpp b/ndb/src/common/mgmcommon/ConfigInfo.cpp
index 1c9edaf330e..0f0d6568383 100644
--- a/ndb/src/common/mgmcommon/ConfigInfo.cpp
+++ b/ndb/src/common/mgmcommon/ConfigInfo.cpp
@@ -18,10 +18,15 @@
#include "ConfigInfo.hpp"
#include <mgmapi_config_parameters.h>
#include <ndb_limits.h>
+#include "InitConfigFileParser.hpp"
#define MAX_LINE_LENGTH 255
#define KEY_INTERNAL 0
-#define MAX_INT_RNIL (RNIL - 1)
+
+#define RNIL_STRING "0xffffff00"
+#define MAX_INT_RNIL_STRING "0xfffffeff"
+#define MAX_NODES_STRING "63"
+
/****************************************************************************
* Section names
****************************************************************************/
@@ -162,14 +167,14 @@ const int ConfigInfo::m_NoOfRules = sizeof(m_SectionRules)/sizeof(SectionRule);
* Config Rules declarations
****************************************************************************/
static bool add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections,
- struct InitConfigFileParser::Context &ctx,
- const char * rule_data);
+ struct InitConfigFileParser::Context &ctx,
+ const char * rule_data);
static bool add_server_ports(Vector<ConfigInfo::ConfigRuleSection>&sections,
- struct InitConfigFileParser::Context &ctx,
- const char * rule_data);
+ struct InitConfigFileParser::Context &ctx,
+ const char * rule_data);
static bool check_node_vs_replicas(Vector<ConfigInfo::ConfigRuleSection>&sections,
- struct InitConfigFileParser::Context &ctx,
- const char * rule_data);
+ struct InitConfigFileParser::Context &ctx,
+ const char * rule_data);
const ConfigInfo::ConfigRule
ConfigInfo::m_ConfigRules[] = {
@@ -216,6 +221,7 @@ const DepricationTransform f_deprication[] = {
* Parameters used under development should be marked "NOTIMPLEMENTED"
* *******************************************************************
*/
+
const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
/****************************************************************************
@@ -241,8 +247,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
MANDATORY,
- 0,
- 0 },
+ 0, 0 },
{
KEY_INTERNAL,
@@ -253,8 +258,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
/****************************************************************************
* SYSTEM
@@ -267,9 +271,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::SECTION,
- CFG_SECTION_SYSTEM,
- 0,
- 0 },
+ (const char *)CFG_SECTION_SYSTEM,
+ 0, 0 },
{
CFG_SYS_NAME,
@@ -280,8 +283,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
MANDATORY,
- 0,
- 0 },
+ 0, 0 },
{
CFG_SYS_REPLICATION_ROLE,
@@ -292,8 +294,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- 0 },
+ 0, 0 },
{
CFG_SYS_PRIMARY_MGM_NODE,
@@ -303,9 +304,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- MAX_INT_RNIL },
+ "0",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_SYS_CONFIG_GENERATION,
@@ -315,9 +316,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- MAX_INT_RNIL },
+ "0",
+ "0",
+ MAX_INT_RNIL_STRING },
/***************************************************************************
* DB
@@ -330,8 +331,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::SECTION,
- NODE_TYPE_DB,
- 0, 0
+ (const char *)NODE_TYPE_DB,
+ 0, 0
},
{
@@ -343,8 +344,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_NODE_SYSTEM,
@@ -355,8 +355,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_NODE_ID,
@@ -367,8 +366,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 1,
- (MAX_NODES - 1) },
+ "1",
+ MAX_NODES_STRING },
{
KEY_INTERNAL,
@@ -379,8 +378,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
UNDEFINED,
- 1,
- 65535 },
+ "1",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_NO_REPLICAS,
@@ -391,8 +390,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 1,
- 4 },
+ "1",
+ "4" },
{
CFG_DB_NO_ATTRIBUTES,
@@ -402,9 +401,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 1000,
- 32,
- MAX_INT_RNIL/16 },
+ "1000",
+ "32",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_NO_TABLES,
@@ -414,9 +413,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 128,
- 8,
- MAX_INT_RNIL },
+ "128",
+ "8",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_NO_INDEXES,
@@ -426,9 +425,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 128,
- 0,
- MAX_INT_RNIL },
+ "128",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_NO_INDEX_OPS,
@@ -438,10 +437,10 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 8192,
- 0,
- MAX_INT_RNIL
- },
+ "8K",
+ "0",
+ MAX_INT_RNIL_STRING
+ },
{
CFG_DB_NO_TRIGGERS,
@@ -451,9 +450,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 768,
- 0,
- MAX_INT_RNIL },
+ "768",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_NO_TRIGGER_OPS,
@@ -463,9 +462,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 4000,
- 0,
- MAX_INT_RNIL },
+ "4000",
+ "0",
+ MAX_INT_RNIL_STRING },
{
KEY_INTERNAL,
@@ -475,9 +474,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::STRING,
- MANDATORY,
- 0,
- MAX_INT_RNIL },
+ UNDEFINED,
+ 0, 0 },
{
CFG_DB_NO_SAVE_MSGS,
@@ -487,9 +485,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 25,
- 0,
- MAX_INT_RNIL },
+ "25",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_MEMLOCK,
@@ -499,9 +497,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::BOOL,
- false,
- 0,
- MAX_INT_RNIL },
+ "false",
+ "false",
+ "true" },
{
CFG_DB_WATCHDOG_INTERVAL,
@@ -511,9 +509,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 6000,
- 70,
- MAX_INT_RNIL },
+ "6000",
+ "70",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_STOP_ON_ERROR,
@@ -523,9 +521,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::BOOL,
- true,
- 0,
- MAX_INT_RNIL },
+ "true",
+ "false",
+ "true" },
{
CFG_DB_STOP_ON_ERROR_INSERT,
@@ -535,9 +533,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::INTERNAL,
true,
ConfigInfo::INT,
- 2,
- 0,
- 4 },
+ "2",
+ "0",
+ "4" },
{
CFG_DB_NO_OPS,
@@ -547,9 +545,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 32768,
- 32,
- MAX_INT_RNIL },
+ "32K",
+ "32",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_NO_TRANSACTIONS,
@@ -559,9 +557,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 4096,
- 32,
- MAX_INT_RNIL },
+ "4096",
+ "32",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_NO_SCANS,
@@ -571,9 +569,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 256,
- 2,
- 500 },
+ "256",
+ "2",
+ "500" },
{
CFG_DB_TRANS_BUFFER_MEM,
@@ -583,9 +581,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- (1024 * 1024),
- 1024,
- MAX_INT_RNIL },
+ "1M",
+ "1K",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_INDEX_MEM,
@@ -595,9 +593,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT64,
- 3 * 1024 * 8192,
- 128 * 8192,
- ((Uint64)MAX_INT_RNIL) * ((Uint64)8192) },
+ "18M",
+ "1M",
+ "1024G" },
{
CFG_DB_DATA_MEM,
@@ -607,9 +605,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT64,
- 10 * 1024 * 8192,
- 128 * 8192,
- ((Uint64)MAX_INT_RNIL) * ((Uint64)8192) },
+ "80M",
+ "1M",
+ "1024G" },
{
CFG_DB_START_PARTIAL_TIMEOUT,
@@ -619,9 +617,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 30000,
- 0,
- ~0 },
+ "30000",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_START_PARTITION_TIMEOUT,
@@ -631,9 +629,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 60000,
- 0,
- ~0 },
+ "60000",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_START_FAILURE_TIMEOUT,
@@ -643,9 +641,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 0,
- 0,
- ~0 },
+ "0",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_HEARTBEAT_INTERVAL,
@@ -655,9 +653,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 1500,
- 10,
- MAX_INT_RNIL },
+ "1500",
+ "10",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_API_HEARTBEAT_INTERVAL,
@@ -667,9 +665,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 1500,
- 100,
- MAX_INT_RNIL },
+ "1500",
+ "100",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_LCP_INTERVAL,
@@ -679,9 +677,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 20,
- 0,
- 31 },
+ "20",
+ "0",
+ "31" },
{
CFG_DB_GCP_INTERVAL,
@@ -691,9 +689,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 2000,
- 10,
- 32000 },
+ "2000",
+ "10",
+ "32000" },
{
CFG_DB_NO_REDOLOG_FILES,
@@ -703,9 +701,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 8,
- 1,
- MAX_INT_RNIL },
+ "8",
+ "1",
+ MAX_INT_RNIL_STRING },
{
KEY_INTERNAL,
@@ -715,9 +713,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 40,
- 20,
- 256 },
+ "40",
+ "20",
+ "256" },
{
@@ -728,9 +726,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 1000,
- 1000,
- MAX_INT_RNIL },
+ "1000",
+ "1000",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_TRANSACTION_INACTIVE_TIMEOUT,
@@ -744,9 +742,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- MAX_INT_RNIL,
- 0,
- MAX_INT_RNIL },
+ MAX_INT_RNIL_STRING,
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_TRANSACTION_DEADLOCK_TIMEOUT,
@@ -759,9 +757,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 1200,
- 50,
- MAX_INT_RNIL },
+ "1200",
+ "50",
+ MAX_INT_RNIL_STRING },
{
KEY_INTERNAL,
@@ -771,9 +769,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 40,
- 1,
- MAX_INT_RNIL },
+ "40",
+ "1",
+ MAX_INT_RNIL_STRING },
{
KEY_INTERNAL,
@@ -783,9 +781,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 40,
- 1,
- MAX_INT_RNIL },
+ "40",
+ "1",
+ MAX_INT_RNIL_STRING },
{
KEY_INTERNAL,
@@ -795,9 +793,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 20,
- 1,
- MAX_INT_RNIL },
+ "20",
+ "1",
+ MAX_INT_RNIL_STRING },
{
KEY_INTERNAL,
@@ -807,9 +805,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 20,
- 1,
- MAX_INT_RNIL },
+ "20",
+ "1",
+ MAX_INT_RNIL_STRING },
{
@@ -820,9 +818,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::BOOL,
- 0,
- 0,
- 1},
+ "false",
+ "false",
+ "true"},
{
KEY_INTERNAL,
@@ -832,9 +830,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::DEPRICATED,
true,
ConfigInfo::BOOL,
- 0,
- 0,
- 1},
+ "false",
+ "false",
+ "true"},
@@ -846,9 +844,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 3000,
- 10,
- MAX_INT_RNIL },
+ "3000",
+ "10",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_FILESYSTEM_PATH,
@@ -858,9 +856,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::STRING,
- UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ DATADIR,
+ 0, 0 },
{
CFG_LOGLEVEL_STARTUP,
@@ -870,9 +867,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 1,
- 0,
- 15 },
+ "1",
+ "0",
+ "15" },
{
CFG_LOGLEVEL_SHUTDOWN,
@@ -882,9 +879,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- 15 },
+ "0",
+ "0",
+ "15" },
{
CFG_LOGLEVEL_STATISTICS,
@@ -894,9 +891,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- 15 },
+ "0",
+ "0",
+ "15" },
{
CFG_LOGLEVEL_CHECKPOINT,
@@ -906,9 +903,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- 15 },
+ "0",
+ "0",
+ "15" },
{
CFG_LOGLEVEL_NODERESTART,
@@ -918,9 +915,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- 15 },
+ "0",
+ "0",
+ "15" },
{
CFG_LOGLEVEL_CONNECTION,
@@ -930,9 +927,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- 15 },
+ "0",
+ "0",
+ "15" },
{
CFG_LOGLEVEL_ERROR,
@@ -942,9 +939,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- 15 },
+ "0",
+ "0",
+ "15" },
{
CFG_LOGLEVEL_INFO,
@@ -954,9 +951,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- 15 },
+ "0",
+ "0",
+ "15" },
/**
* Backup
@@ -969,9 +966,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::NOTIMPLEMENTED,
false,
ConfigInfo::INT,
- 1,
- 1,
- 1 },
+ "1",
+ "1",
+ "1" },
{
CFG_DB_BACKUP_MEM,
@@ -981,9 +978,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- (2 * 1024 * 1024) + (2 * 1024 * 1024), // sum of BackupDataBufferSize and BackupLogBufferSize
- 0,
- MAX_INT_RNIL },
+ "4M", // sum of BackupDataBufferSize and BackupLogBufferSize
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_BACKUP_DATA_BUFFER_MEM,
@@ -993,9 +990,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- (2 * 1024 * 1024), // remember to change BackupMemory
- 0,
- MAX_INT_RNIL },
+ "2M", // remember to change BackupMemory
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_BACKUP_LOG_BUFFER_MEM,
@@ -1005,9 +1002,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- (2 * 1024 * 1024), // remember to change BackupMemory
- 0,
- MAX_INT_RNIL },
+ "2M", // remember to change BackupMemory
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_DB_BACKUP_WRITE_SIZE,
@@ -1017,9 +1014,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 32768,
- 0,
- MAX_INT_RNIL },
+ "32K",
+ "0",
+ MAX_INT_RNIL_STRING },
/***************************************************************************
* REP
@@ -1032,8 +1029,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::SECTION,
- NODE_TYPE_REP,
- 0, 0
+ (const char *)NODE_TYPE_REP,
+ 0, 0
},
{
@@ -1045,8 +1042,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_NODE_SYSTEM,
@@ -1057,8 +1053,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_NODE_ID,
@@ -1069,8 +1064,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 1,
- (MAX_NODES - 1) },
+ "1",
+ MAX_NODES_STRING },
{
KEY_INTERNAL,
@@ -1081,8 +1076,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_REP_HEARTBEAT_INTERVAL,
@@ -1092,9 +1086,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
true,
ConfigInfo::INT,
- 3000,
- 100,
- MAX_INT_RNIL },
+ "3000",
+ "100",
+ MAX_INT_RNIL_STRING },
/***************************************************************************
* API
@@ -1107,8 +1101,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::SECTION,
- NODE_TYPE_API,
- 0, 0
+ (const char *)NODE_TYPE_API,
+ 0, 0
},
{
@@ -1120,8 +1114,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_NODE_SYSTEM,
@@ -1132,8 +1125,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_NODE_ID,
@@ -1144,8 +1136,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 1,
- (MAX_NODES - 1) },
+ "1",
+ MAX_NODES_STRING },
{
KEY_INTERNAL,
@@ -1155,9 +1147,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::STRING,
- 0,
- 0,
- MAX_INT_RNIL },
+ UNDEFINED,
+ 0, 0 },
{
CFG_NODE_ARBIT_RANK,
@@ -1167,9 +1158,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- 2 },
+ "0",
+ "0",
+ "2" },
{
CFG_NODE_ARBIT_DELAY,
@@ -1179,9 +1170,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- MAX_INT_RNIL },
+ "0",
+ "0",
+ MAX_INT_RNIL_STRING },
/****************************************************************************
* MGM
@@ -1194,8 +1185,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::SECTION,
- NODE_TYPE_MGM,
- 0, 0
+ (const char *)NODE_TYPE_MGM,
+ 0, 0
},
{
@@ -1207,8 +1198,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_NODE_SYSTEM,
@@ -1219,8 +1209,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_NODE_ID,
@@ -1231,8 +1220,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 1,
- (MAX_NODES - 1) },
+ "1",
+ MAX_NODES_STRING },
{
CFG_LOG_DESTINATION,
@@ -1243,8 +1232,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
0,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
KEY_INTERNAL,
@@ -1255,9 +1243,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
0,
- 0,
- MAX_INT_RNIL },
-
+ 0, 0 },
+
{
KEY_INTERNAL,
"MaxNoOfSavedEvents",
@@ -1266,9 +1253,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 100,
- 0,
- MAX_INT_RNIL },
+ "100",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_MGM_PORT,
@@ -1279,8 +1266,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
NDB_BASE_PORT,
- 0,
- MAX_INT_RNIL },
+ "0",
+ MAX_INT_RNIL_STRING },
{
KEY_INTERNAL,
@@ -1290,9 +1277,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 2199,
- 0,
- MAX_INT_RNIL },
+ "2199",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_NODE_ARBIT_RANK,
@@ -1302,9 +1289,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 1,
- 0,
- 2 },
+ "1",
+ "0",
+ "2" },
{
CFG_NODE_ARBIT_DELAY,
@@ -1314,9 +1301,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 0,
- 0,
- MAX_INT_RNIL },
+ "0",
+ "0",
+ MAX_INT_RNIL_STRING },
/****************************************************************************
* TCP
@@ -1329,8 +1316,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::SECTION,
- CONNECTION_TYPE_TCP,
- 0, 0
+ (const char *)CONNECTION_TYPE_TCP,
+ 0, 0
},
{
@@ -1342,8 +1329,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_TCP_HOSTNAME_2,
@@ -1354,8 +1340,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_CONNECTION_NODE_1,
@@ -1366,8 +1351,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_CONNECTION_NODE_2,
@@ -1378,8 +1362,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_CONNECTION_SEND_SIGNAL_ID,
@@ -1389,9 +1372,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::BOOL,
- true,
- 0,
- MAX_INT_RNIL },
+ "true",
+ "false",
+ "true" },
{
@@ -1402,9 +1385,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::BOOL,
- false,
- 0,
- MAX_INT_RNIL },
+ "false",
+ "false",
+ "true" },
{
CFG_CONNECTION_SERVER_PORT,
@@ -1415,8 +1398,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_TCP_SEND_BUFFER_SIZE,
@@ -1426,9 +1409,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 16 * 16384,
- 1 * 16384,
- MAX_INT_RNIL },
+ "256K",
+ "16K",
+ MAX_INT_RNIL_STRING },
{
CFG_TCP_RECEIVE_BUFFER_SIZE,
@@ -1438,9 +1421,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 4 * 16384,
- 1 * 16384,
- MAX_INT_RNIL },
+ "64K",
+ "16K",
+ MAX_INT_RNIL_STRING },
{
CFG_TCP_PROXY,
@@ -1451,8 +1434,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- 0 },
+ 0, 0 },
{
CFG_CONNECTION_NODE_1_SYSTEM,
@@ -1463,8 +1445,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_CONNECTION_NODE_2_SYSTEM,
@@ -1475,8 +1456,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
/****************************************************************************
@@ -1490,9 +1470,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::SECTION,
- CONNECTION_TYPE_SHM,
- 0, 0
- },
+ (const char *)CONNECTION_TYPE_SHM,
+ 0, 0 },
{
CFG_CONNECTION_NODE_1,
@@ -1503,8 +1482,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_CONNECTION_SERVER_PORT,
@@ -1515,8 +1493,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_CONNECTION_NODE_2,
@@ -1527,8 +1505,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_CONNECTION_SEND_SIGNAL_ID,
@@ -1538,9 +1515,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::BOOL,
- false,
- 0,
- MAX_INT_RNIL },
+ "false",
+ "false",
+ "true" },
{
@@ -1551,9 +1528,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::BOOL,
- true,
- 0,
- MAX_INT_RNIL },
+ "true",
+ "false",
+ "true" },
{
CFG_SHM_KEY,
@@ -1564,8 +1541,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_SHM_BUFFER_MEM,
@@ -1575,10 +1552,10 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 1048576,
- 4096,
- MAX_INT_RNIL },
-
+ "1M",
+ "4K",
+ MAX_INT_RNIL_STRING },
+
{
CFG_CONNECTION_NODE_1_SYSTEM,
"NodeId1_System",
@@ -1588,8 +1565,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_CONNECTION_NODE_2_SYSTEM,
@@ -1600,8 +1576,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
/****************************************************************************
* SCI
@@ -1614,7 +1589,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::SECTION,
- CONNECTION_TYPE_SCI,
+ (const char *)CONNECTION_TYPE_SCI,
0, 0
},
@@ -1627,8 +1602,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_CONNECTION_NODE_2,
@@ -1639,8 +1614,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_SCI_ID_0,
@@ -1651,8 +1626,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_SCI_ID_1,
@@ -1663,8 +1638,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_CONNECTION_SEND_SIGNAL_ID,
@@ -1674,9 +1649,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::BOOL,
- true,
- 0,
- MAX_INT_RNIL },
+ "true",
+ "false",
+ "true" },
{
CFG_CONNECTION_CHECKSUM,
@@ -1686,9 +1661,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::BOOL,
- false,
- 0,
- MAX_INT_RNIL },
+ "false",
+ "false",
+ "true" },
{
CFG_SCI_SEND_LIMIT,
@@ -1698,9 +1673,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 2048,
- 512,
- MAX_INT_RNIL },
+ "2K",
+ "512",
+ MAX_INT_RNIL_STRING },
{
CFG_SCI_BUFFER_MEM,
@@ -1710,9 +1685,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 1048576,
- 262144,
- MAX_INT_RNIL },
+ "1M",
+ "256K",
+ MAX_INT_RNIL_STRING },
{
CFG_CONNECTION_NODE_1_SYSTEM,
@@ -1723,8 +1698,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_CONNECTION_NODE_2_SYSTEM,
@@ -1735,8 +1709,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
/****************************************************************************
* OSE
@@ -1749,7 +1722,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::SECTION,
- CONNECTION_TYPE_OSE,
+ (const char *)CONNECTION_TYPE_OSE,
0, 0
},
@@ -1762,8 +1735,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_OSE_HOSTNAME_2,
@@ -1774,8 +1746,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
{
CFG_CONNECTION_NODE_1,
@@ -1786,8 +1757,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
MANDATORY,
- 0,
- MAX_INT_RNIL },
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_CONNECTION_NODE_2,
@@ -1798,8 +1769,8 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::INT,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_CONNECTION_SEND_SIGNAL_ID,
@@ -1809,9 +1780,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::BOOL,
- true,
- 0,
- MAX_INT_RNIL },
+ "true",
+ "false",
+ "true" },
{
CFG_CONNECTION_CHECKSUM,
@@ -1821,9 +1792,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::BOOL,
- false,
- 0,
- MAX_INT_RNIL },
+ "false",
+ "false",
+ "true" },
{
CFG_OSE_PRIO_A_SIZE,
@@ -1833,9 +1804,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 1000,
- 0,
- MAX_INT_RNIL },
+ "1000",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_OSE_PRIO_B_SIZE,
@@ -1845,9 +1816,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 1000,
- 0,
- MAX_INT_RNIL },
+ "1000",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_OSE_RECEIVE_ARRAY_SIZE,
@@ -1857,9 +1828,9 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::USED,
false,
ConfigInfo::INT,
- 10,
- 0,
- MAX_INT_RNIL },
+ "10",
+ "0",
+ MAX_INT_RNIL_STRING },
{
CFG_CONNECTION_NODE_1_SYSTEM,
@@ -1870,8 +1841,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL},
+ 0, 0 },
{
CFG_CONNECTION_NODE_2_SYSTEM,
@@ -1882,8 +1852,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
false,
ConfigInfo::STRING,
UNDEFINED,
- 0,
- MAX_INT_RNIL },
+ 0, 0 },
};
const int ConfigInfo::m_NoOfParams = sizeof(m_ParamInfo) / sizeof(ParamInfo);
@@ -1901,8 +1870,20 @@ ConfigInfo::ConfigInfo()
Properties *section;
const Properties *oldpinfo;
+ {
+ Uint64 tmp_uint64;
+ require(InitConfigFileParser::convertStringToUint64(RNIL_STRING, tmp_uint64));
+ require(tmp_uint64 == RNIL);
+ require(InitConfigFileParser::convertStringToUint64(MAX_INT_RNIL_STRING, tmp_uint64));
+ require(tmp_uint64 == ((Uint64)RNIL-1));
+ require(InitConfigFileParser::convertStringToUint64(MAX_NODES_STRING, tmp_uint64));
+ require(tmp_uint64 == (MAX_NODES-1));
+ }
+
for (i=0; i<m_NoOfParams; i++) {
const ParamInfo & param = m_ParamInfo[i];
+ Uint64 default_uint64;
+ bool default_bool;
// Create new section if it did not exist
if (!m_info.getCopy(param._section, &section)) {
@@ -1921,9 +1902,37 @@ ConfigInfo::ConfigInfo()
pinfo.put("Updateable", param._updateable);
pinfo.put("Type", param._type);
pinfo.put("Status", param._status);
- pinfo.put64("Default", param._default);
- pinfo.put64("Min", param._min);
- pinfo.put64("Max", param._max);
+
+ if(param._default == MANDATORY){
+ pinfo.put("Mandatory", (Uint32)1);
+ }
+
+ switch (param._type) {
+ case BOOL:
+ {
+ bool tmp_bool;
+ require(InitConfigFileParser::convertStringToBool(param._min, tmp_bool));
+ pinfo.put64("Min", tmp_bool);
+ require(InitConfigFileParser::convertStringToBool(param._max, tmp_bool));
+ pinfo.put64("Max", tmp_bool);
+ break;
+ }
+ case INT:
+ case INT64:
+ {
+ Uint64 tmp_uint64;
+ require(InitConfigFileParser::convertStringToUint64(param._min, tmp_uint64));
+ pinfo.put64("Min", tmp_uint64);
+ require(InitConfigFileParser::convertStringToUint64(param._max, tmp_uint64));
+ pinfo.put64("Max", tmp_uint64);
+ break;
+ }
+ case SECTION:
+ pinfo.put("SectionType", (Uint32)param._default);
+ break;
+ case STRING:
+ break;
+ }
// Check that pinfo is really new
if (section->get(param._fname, &oldpinfo)) {
@@ -1944,10 +1953,31 @@ ConfigInfo::ConfigInfo()
if(!m_systemDefaults.getCopy(param._section, &p)){
p = new Properties(true);
}
- if(param._type != STRING &&
- param._default != UNDEFINED &&
+ if(param._default != UNDEFINED &&
param._default != MANDATORY){
- require(p->put(param._fname, param._default));
+ switch (param._type)
+ {
+ case SECTION:
+ break;
+ case STRING:
+ require(p->put(param._fname, param._default));
+ break;
+ case BOOL:
+ {
+ bool tmp_bool;
+ require(InitConfigFileParser::convertStringToBool(param._default, default_bool));
+ require(p->put(param._fname, default_bool));
+ break;
+ }
+ case INT:
+ case INT64:
+ {
+ Uint64 tmp_uint64;
+ require(InitConfigFileParser::convertStringToUint64(param._default, default_uint64));
+ require(p->put(param._fname, default_uint64));
+ break;
+ }
+ }
}
require(m_systemDefaults.put(param._section, p, true));
delete p;
@@ -2141,7 +2171,7 @@ void ConfigInfo::print(const Properties * section,
ndbout << "Default: N (Legal values: Y, N)" << endl;
} else if (getDefault(section, parameter) == true) {
ndbout << "Default: Y (Legal values: Y, N)" << endl;
- } else if (getDefault(section, parameter) == MANDATORY) {
+ } else if (getDefault(section, parameter) == (UintPtr)MANDATORY) {
ndbout << "MANDATORY (Legal values: Y, N)" << endl;
} else {
ndbout << "UNKNOWN" << endl;
@@ -2153,9 +2183,9 @@ void ConfigInfo::print(const Properties * section,
case ConfigInfo::INT64:
ndbout << " (Non-negative Integer)" << endl;
ndbout << getDescription(section, parameter) << endl;
- if (getDefault(section, parameter) == MANDATORY) {
+ if (getDefault(section, parameter) == (UintPtr)MANDATORY) {
ndbout << "MANDATORY (";
- } else if (getDefault(section, parameter) == UNDEFINED) {
+ } else if (getDefault(section, parameter) == (UintPtr)UNDEFINED) {
ndbout << "UNDEFINED (";
} else {
ndbout << "Default: " << getDefault(section, parameter) << " (";
@@ -2168,7 +2198,7 @@ void ConfigInfo::print(const Properties * section,
case ConfigInfo::STRING:
ndbout << " (String)" << endl;
ndbout << getDescription(section, parameter) << endl;
- if (getDefault(section, parameter) == MANDATORY) {
+ if (getDefault(section, parameter) == (UintPtr)MANDATORY) {
ndbout << "MANDATORY" << endl;
} else {
ndbout << "No default value" << endl;
@@ -2234,17 +2264,17 @@ transformNode(InitConfigFileParser::Context & ctx, const char * data){
bool
fixNodeHostname(InitConfigFileParser::Context & ctx, const char * data){
+ const char * hostname;
+ if (ctx.m_currentSection->get("HostName", &hostname))
+ return true;
+
const char * compId;
if(!ctx.m_currentSection->get("ExecuteOnComputer", &compId)){
- require(ctx.m_currentSection->put("HostName", ""));
-
const char * type;
- if(ctx.m_currentSection->get("Type", &type) && strcmp(type,"DB") == 0) {
- ctx.reportError("Parameter \"ExecuteOnComputer\" missing from DB section"
- " [%s] starting at line: %d",
- ctx.fname, ctx.m_sectionLineno);
- return false;
- }
+ if(ctx.m_currentSection->get("Type", &type) && strcmp(type,"DB") == 0)
+ require(ctx.m_currentSection->put("HostName", "localhost"));
+ else
+ require(ctx.m_currentSection->put("HostName", ""));
return true;
}
@@ -2258,7 +2288,6 @@ fixNodeHostname(InitConfigFileParser::Context & ctx, const char * data){
return false;
}
- const char * hostname;
if(!computer->get("HostName", &hostname)){
ctx.reportError("HostName missing in [COMPUTER] (Id: %d) "
" - [%s] starting at line: %d",
@@ -2456,7 +2485,7 @@ checkMandatory(InitConfigFileParser::Context & ctx, const char * data){
const Properties * info = NULL;
::require(ctx.m_currentInfo->get(name, &info));
Uint32 val;
- if(info->get("Default", &val) && val == MANDATORY){
+ if(info->get("Mandatory", &val)){
const char * fname;
::require(info->get("Fname", &fname));
if(!ctx.m_currentSection->contains(fname)){
@@ -2650,7 +2679,7 @@ fixPortNumber(InitConfigFileParser::Context & ctx, const char * data){
if (!ctx.m_userProperties.get("ServerPortBase", &base)){
if(!(ctx.m_userDefaults && ctx.m_userDefaults->get("PortNumber", &base)) &&
!ctx.m_systemDefaults->get("PortNumber", &base)) {
- base= NDB_BASE_PORT+2;
+ base= strtoll(NDB_BASE_PORT,0,0)+2;
// ctx.reportError("Cannot retrieve base port number");
// return false;
}
@@ -2902,7 +2931,7 @@ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){
require(sec->get("Fname", &secName));
require(sec->get("Id", &id));
require(sec->get("Status", &status));
- require(sec->get("Default", &typeVal));
+ require(sec->get("SectionType", &typeVal));
if(id == KEY_INTERNAL || status == ConfigInfo::INTERNAL){
ndbout_c("skipping section %s", ctx.fname);
diff --git a/ndb/src/common/mgmcommon/ConfigInfo.hpp b/ndb/src/common/mgmcommon/ConfigInfo.hpp
index 9a954fe78d5..50190082e3f 100644
--- a/ndb/src/common/mgmcommon/ConfigInfo.hpp
+++ b/ndb/src/common/mgmcommon/ConfigInfo.hpp
@@ -27,8 +27,8 @@
* A MANDATORY parameters must be specified in the config file
* An UNDEFINED parameter may or may not be specified in the config file
*/
-static const Uint64 MANDATORY = ~0; // Default value for mandatory params.
-static const Uint64 UNDEFINED = (~0)-1; // Default value for undefined params.
+static const char* MANDATORY = (char*)~(UintPtr)0; // Default value for mandatory params.
+static const char* UNDEFINED = 0; // Default value for undefined params.
/**
* @class ConfigInfo
@@ -56,9 +56,9 @@ public:
Status _status;
bool _updateable;
Type _type;
- Uint64 _default;
- Uint64 _min;
- Uint64 _max;
+ const char* _default;
+ const char* _min;
+ const char* _max;
};
struct AliasPair{
diff --git a/ndb/src/common/mgmcommon/InitConfigFileParser.cpp b/ndb/src/common/mgmcommon/InitConfigFileParser.cpp
index dab4e9a7c77..833a2efab9d 100644
--- a/ndb/src/common/mgmcommon/InitConfigFileParser.cpp
+++ b/ndb/src/common/mgmcommon/InitConfigFileParser.cpp
@@ -31,7 +31,6 @@ static void require(bool v) { if(!v) abort();}
// Ctor / Dtor
//****************************************************************************
InitConfigFileParser::InitConfigFileParser(){
-
m_info = new ConfigInfo();
}
@@ -111,7 +110,6 @@ InitConfigFileParser::parseConfig(FILE * file) {
"of configuration file.");
return 0;
}
-
snprintf(ctx.fname, sizeof(ctx.fname), section); free(section);
ctx.type = InitConfigFileParser::DefaultSection;
ctx.m_sectionLineno = ctx.m_lineno;
@@ -132,7 +130,6 @@ InitConfigFileParser::parseConfig(FILE * file) {
"of configuration file.");
return 0;
}
-
snprintf(ctx.fname, sizeof(ctx.fname), section);
free(section);
ctx.type = InitConfigFileParser::Section;
@@ -162,7 +159,6 @@ InitConfigFileParser::parseConfig(FILE * file) {
ctx.reportError("Could not store section of configuration file.");
return 0;
}
-
for(size_t i = 0; ConfigInfo::m_ConfigRules[i].m_configRule != 0; i++){
ctx.type = InitConfigFileParser::Undefined;
ctx.m_currentSection = 0;
@@ -387,7 +383,7 @@ bool InitConfigFileParser::convertStringToUint64(const char* s,
errno = 0;
char* p;
- long long v = strtoll(s, &p, 10);
+ long long v = strtoll(s, &p, log10base);
if (errno != 0)
return false;
@@ -565,20 +561,18 @@ InitConfigFileParser::storeSection(Context& ctx){
if(ctx.type == InitConfigFileParser::Section){
for(int i = 0; i<m_info->m_NoOfRules; i++){
const ConfigInfo::SectionRule & rule = m_info->m_SectionRules[i];
- if(!strcmp(rule.m_section, "*") || !strcmp(rule.m_section, ctx.fname))
- if(!(* rule.m_sectionRule)(ctx, rule.m_ruleData))
+ if(!strcmp(rule.m_section, "*") || !strcmp(rule.m_section, ctx.fname)){
+ if(!(* rule.m_sectionRule)(ctx, rule.m_ruleData)){
return false;
+ }
+ }
}
}
-
if(ctx.type == InitConfigFileParser::DefaultSection)
require(ctx.m_defaults->put(ctx.pname, ctx.m_currentSection));
-
if(ctx.type == InitConfigFileParser::Section)
require(ctx.m_config->put(ctx.pname, ctx.m_currentSection));
-
delete ctx.m_currentSection; ctx.m_currentSection = NULL;
-
return true;
}
diff --git a/ndb/src/common/mgmcommon/InitConfigFileParser.hpp b/ndb/src/common/mgmcommon/InitConfigFileParser.hpp
index 6b7482c12ae..1ea0a094ccd 100644
--- a/ndb/src/common/mgmcommon/InitConfigFileParser.hpp
+++ b/ndb/src/common/mgmcommon/InitConfigFileParser.hpp
@@ -86,6 +86,9 @@ public:
void reportWarning(const char * msg, ...);
};
+ static bool convertStringToUint64(const char* s, Uint64& val, Uint32 log10base = 0);
+ static bool convertStringToBool(const char* s, bool& val);
+
private:
/**
* Check if line only contains space/comments
@@ -111,8 +114,6 @@ private:
bool parseNameValuePair(Context&, const char* line);
bool storeNameValuePair(Context&, const char* fname, const char* value);
- bool convertStringToUint64(const char* s, Uint64& val, Uint32 log10base = 0);
- bool convertStringToBool(const char* s, bool& val);
bool storeSection(Context&);
const Properties* getSection(const char * name, const Properties* src);
diff --git a/ndb/src/common/mgmcommon/LocalConfig.cpp b/ndb/src/common/mgmcommon/LocalConfig.cpp
index 0440ce84dba..1ad87e5f7ac 100644
--- a/ndb/src/common/mgmcommon/LocalConfig.cpp
+++ b/ndb/src/common/mgmcommon/LocalConfig.cpp
@@ -89,7 +89,7 @@ LocalConfig::init(const char *connectString,
//7. Check
{
char buf[256];
- snprintf(buf, sizeof(buf), "host=localhost:%u", NDB_BASE_PORT);
+ snprintf(buf, sizeof(buf), "host=localhost:%s", NDB_BASE_PORT);
if(readConnectString(buf))
return true;
}
diff --git a/ndb/src/common/mgmcommon/Makefile.am b/ndb/src/common/mgmcommon/Makefile.am
index 8a34fa16ed1..174999579d4 100644
--- a/ndb/src/common/mgmcommon/Makefile.am
+++ b/ndb/src/common/mgmcommon/Makefile.am
@@ -1,3 +1,7 @@
+MYSQLDATAdir = $(localstatedir)
+MYSQLSHAREdir = $(pkgdatadir)
+MYSQLBASEdir= $(prefix)
+
noinst_LTLIBRARIES = libmgmsrvcommon.la
libmgmsrvcommon_la_SOURCES = \
@@ -10,6 +14,11 @@ libmgmsrvcommon_la_SOURCES = \
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
+DEFS_LOC = -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
+ -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
+ -DNDB_BASE_PORT="\"@ndb_port_base@\""
+
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
diff --git a/ndb/src/cw/cpcd/Makefile.am b/ndb/src/cw/cpcd/Makefile.am
index 1f7b0d88448..e276d1a766d 100644
--- a/ndb/src/cw/cpcd/Makefile.am
+++ b/ndb/src/cw/cpcd/Makefile.am
@@ -3,7 +3,11 @@ ndbbin_PROGRAMS = ndb_cpcd
ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
-LDADD_LOC = $(top_builddir)/ndb/src/libndbclient.la
+LDADD_LOC = \
+ $(top_builddir)/ndb/src/libndbclient.la \
+ $(top_builddir)/dbug/libdbug.a \
+ $(top_builddir)/mysys/libmysys.a \
+ $(top_builddir)/strings/libmystrings.a
include $(top_srcdir)/ndb/config/common.mk.am
include $(top_srcdir)/ndb/config/type_util.mk.am
diff --git a/ndb/src/kernel/blocks/backup/restore/Makefile.am b/ndb/src/kernel/blocks/backup/restore/Makefile.am
index e0429c60723..eef5bc5a203 100644
--- a/ndb/src/kernel/blocks/backup/restore/Makefile.am
+++ b/ndb/src/kernel/blocks/backup/restore/Makefile.am
@@ -3,7 +3,11 @@ ndbtools_PROGRAMS = ndb_restore
ndb_restore_SOURCES = main.cpp consumer.cpp consumer_restore.cpp consumer_printer.cpp Restore.cpp
-LDADD_LOC = $(top_builddir)/ndb/src/libndbclient.la
+LDADD_LOC = \
+ $(top_builddir)/ndb/src/libndbclient.la \
+ $(top_builddir)/dbug/libdbug.a \
+ $(top_builddir)/mysys/libmysys.a \
+ $(top_builddir)/strings/libmystrings.a
include $(top_srcdir)/ndb/config/common.mk.am
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp b/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
index 768a61655b5..a50bb2fe52c 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
@@ -405,3 +405,7 @@ operator<<(NdbOut& out, const Dbtup::Th& th)
return out;
}
#endif
+
+#ifdef VM_TRACE
+template class Vector<Chunk>;
+#endif
diff --git a/ndb/src/mgmclient/CpcClient.cpp b/ndb/src/mgmclient/CpcClient.cpp
index 0291573a704..d407ba65312 100644
--- a/ndb/src/mgmclient/CpcClient.cpp
+++ b/ndb/src/mgmclient/CpcClient.cpp
@@ -44,7 +44,7 @@
ParserRow_t::IgnoreMinMax, \
0, 0, \
0, \
- (desc) }
+ (desc), 0 }
#define CPC_END() \
{ 0, \
@@ -55,7 +55,7 @@
ParserRow_t::IgnoreMinMax, \
0, 0, \
0, \
- 0 }
+ 0, 0 }
#ifdef DEBUG_PRINT_PROPERTIES
static void printprop(const Properties &p) {
diff --git a/ndb/src/mgmsrv/Makefile.am b/ndb/src/mgmsrv/Makefile.am
index fc493fe10c7..dc6e210f576 100644
--- a/ndb/src/mgmsrv/Makefile.am
+++ b/ndb/src/mgmsrv/Makefile.am
@@ -19,6 +19,10 @@ INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi \
LDADD_LOC = $(top_builddir)/ndb/src/libndbclient.la \
$(top_builddir)/ndb/src/common/editline/libeditline.a \
+ $(top_builddir)/ndb/src/libndbclient.la \
+ $(top_builddir)/dbug/libdbug.a \
+ $(top_builddir)/mysys/libmysys.a \
+ $(top_builddir)/strings/libmystrings.a
@TERMCAP_LIB@
include $(top_srcdir)/ndb/config/common.mk.am
diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp
index 7bf408583de..0f54a15c20c 100644
--- a/ndb/src/mgmsrv/Services.cpp
+++ b/ndb/src/mgmsrv/Services.cpp
@@ -1036,7 +1036,7 @@ MgmApiSession::stop(Parser<MgmApiSession>::Context &,
stopped++;
} else
stopped++;
-
+
m_output->println("stop reply");
if(result != 0)
m_output->println("result: %s", m_mgmsrv.getErrorText(result));
diff --git a/ndb/src/mgmsrv/main.cpp b/ndb/src/mgmsrv/main.cpp
index 719226b51df..465d858cfab 100644
--- a/ndb/src/mgmsrv/main.cpp
+++ b/ndb/src/mgmsrv/main.cpp
@@ -265,9 +265,10 @@ NDB_MAIN(mgmsrv){
NdbSleep_MilliSleep(500);
}
+ g_EventLogger.info("Shutting down server...");
glob.socketServer->stopServer();
glob.socketServer->stopSessions();
-
+ g_EventLogger.info("Shutdown complete");
return 0;
error_end:
return 1;
diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp
index f09a7481d2d..bece12d6731 100644
--- a/ndb/src/ndbapi/Ndb.cpp
+++ b/ndb/src/ndbapi/Ndb.cpp
@@ -296,6 +296,7 @@ Remark: Start transaction. Synchronous.
NdbConnection*
Ndb::startTransaction(Uint32 aPriority, const char * keyData, Uint32 keyLen)
{
+ DBUG_ENTER("Ndb::startTransaction");
if (theInitState == Initialised) {
theError.code = 0;
@@ -312,9 +313,9 @@ Ndb::startTransaction(Uint32 aPriority, const char * keyData, Uint32 keyLen)
} else {
nodeId = 0;
}//if
- return startTransactionLocal(aPriority, nodeId);
+ DBUG_RETURN(startTransactionLocal(aPriority, nodeId));
} else {
- return NULL;
+ DBUG_RETURN(NULL);
}//if
}//Ndb::startTransaction()
@@ -329,9 +330,11 @@ Remark: Start transaction. Synchronous.
NdbConnection*
Ndb::hupp(NdbConnection* pBuddyTrans)
{
+ DBUG_ENTER("Ndb::hupp");
+
Uint32 aPriority = 0;
if (pBuddyTrans == NULL){
- return startTransaction();
+ DBUG_RETURN(startTransaction());
}
if (theInitState == Initialised) {
@@ -341,19 +344,19 @@ Ndb::hupp(NdbConnection* pBuddyTrans)
Uint32 nodeId = pBuddyTrans->getConnectedNodeId();
NdbConnection* pCon = startTransactionLocal(aPriority, nodeId);
if(pCon == NULL)
- return NULL;
+ DBUG_RETURN(NULL);
if (pCon->getConnectedNodeId() != nodeId){
// We could not get a connection to the desired node
// release the connection and return NULL
closeTransaction(pCon);
- return NULL;
+ DBUG_RETURN(NULL);
}
pCon->setTransactionId(pBuddyTrans->getTransactionId());
pCon->setBuddyConPtr((Uint32)pBuddyTrans->getTC_ConnectPtr());
- return pCon;
+ DBUG_RETURN(pCon);
} else {
- return NULL;
+ DBUG_RETURN(NULL);
}//if
}//Ndb::hupp()
@@ -443,6 +446,8 @@ Remark: Close transaction by releasing the connection and all operations
void
Ndb::closeTransaction(NdbConnection* aConnection)
{
+ DBUG_ENTER("Ndb::closeTransaction");
+
NdbConnection* tCon;
NdbConnection* tPreviousCon;
@@ -454,7 +459,7 @@ Ndb::closeTransaction(NdbConnection* aConnection)
#ifdef VM_TRACE
printf("NULL into closeTransaction\n");
#endif
- return;
+ DBUG_VOID_RETURN;
}//if
CHECK_STATUS_MACRO_VOID;
@@ -479,14 +484,14 @@ Ndb::closeTransaction(NdbConnection* aConnection)
printf("Scan timeout:ed NdbConnection-> "
"not returning it-> memory leak\n");
#endif
- return;
+ DBUG_VOID_RETURN;
}
#ifdef VM_TRACE
printf("Non-existing transaction into closeTransaction\n");
abort();
#endif
- return;
+ DBUG_VOID_RETURN;
}//if
tPreviousCon = tCon;
tCon = tCon->next();
@@ -505,7 +510,7 @@ Ndb::closeTransaction(NdbConnection* aConnection)
#ifdef VM_TRACE
printf("Con timeout:ed NdbConnection-> not returning it-> memory leak\n");
#endif
- return;
+ DBUG_VOID_RETURN;
}
if (aConnection->theReleaseOnClose == false) {
@@ -515,11 +520,12 @@ Ndb::closeTransaction(NdbConnection* aConnection)
Uint32 nodeId = aConnection->getConnectedNodeId();
aConnection->theNext = theConnectionArray[nodeId];
theConnectionArray[nodeId] = aConnection;
- return;
+ DBUG_VOID_RETURN;
} else {
aConnection->theReleaseOnClose = false;
releaseNdbCon(aConnection);
}//if
+ DBUG_VOID_RETURN;
}//Ndb::closeTransaction()
/*****************************************************************************
diff --git a/ndb/test/run-test/Makefile.am b/ndb/test/run-test/Makefile.am
index 04be35325db..611362ad735 100644
--- a/ndb/test/run-test/Makefile.am
+++ b/ndb/test/run-test/Makefile.am
@@ -12,7 +12,11 @@ test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
atrt_SOURCES = main.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmclient
-LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CpcClient.o $(top_builddir)/ndb/src/libndbclient.la
+LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CpcClient.o \
+ $(top_builddir)/ndb/src/libndbclient.la \
+ $(top_builddir)/dbug/libdbug.a \
+ $(top_builddir)/mysys/libmysys.a \
+ $(top_builddir)/strings/libmystrings.a
# Don't update the files from bitkeeper
%::SCCS/s.%
View Lorry Controller Status