diff options
| author | unknown <tomas@poseidon.(none)> | 2004-08-23 16:29:04 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-08-23 16:29:04 +0000 |
| commit | 1091fe23f63cbc7e2431edcab99ba98726b4c4a9 (patch) | |
| tree | 127fc36efc8bcbc74d47a4b71649045dedbd609d /configure.in | |
| parent | b6d9222da3c2b0f6ec33efa6e16359b1630bad4a (diff) | |
| download | mariadb-git-1091fe23f63cbc7e2431edcab99ba98726b4c4a9.tar.gz | |
further simplifications of ndb config and aligned usage of mysql datadir in ndb
acinclude.m4:
added configure switch for ndb base port
configure.in:
ndb gcc compile now works with -fno-implicit-templates
mysql-test/ndb/ndb_config_2_node.ini:
further simplifications of config, removed need for [COMPUTER] section
ndb/include/ndb_global.h:
moved this to configure option
ndb/src/common/mgmcommon/ConfigInfo.cpp:
changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/ConfigInfo.hpp:
changed config to take to take strings instead of ints
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
string to number convert to accept "0x" prefix on numbers
ndb/src/common/mgmcommon/InitConfigFileParser.hpp:
movet convert function to public and static
ndb/src/common/mgmcommon/LocalConfig.cpp:
define NDB_BASE_PORT now string instead of number
ndb/src/common/mgmcommon/Makefile.am:
added mysqld defines in mgmcommon to be able to configure default data dir to be the same as for mysqld
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 664ffd2a4a1..f58ba482c59 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. @@ -2985,6 +2983,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 |