summaryrefslogtreecommitdiff
path: root/ndb/src/cw/cpcd
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2005-01-28 00:42:41 +0100
committerunknown <tomas@poseidon.ndb.mysql.com>2005-01-28 00:42:41 +0100
commitdf7bb879cdbbf61e4c879cc6f13126a0be69dff7 (patch)
treeb49b8c43f32032d4eac08d9789796e546970efec /ndb/src/cw/cpcd
parenta271a6c878ffe8245bd631888bfeee3cb5055005 (diff)
downloadmariadb-git-df7bb879cdbbf61e4c879cc6f13126a0be69dff7.tar.gz
Bug#8167 signal usage clash between mysql server and ndb shared memory
added shared memory config parameter, signum for use in signalling added global variable for holdign signum to be used for shared memory connection only fiddle with signals if it is set simplified common ndb client option handling ndb/include/Makefile.am: added common defaults file ndb/include/mgmapi/mgmapi_config_parameters.h: added shared memory config parameter, signum for use in signalling ndb/include/transporter/TransporterDefinitions.hpp: added shared memory config parameter, signum for use in signalling ndb/include/util/ndb_opts.h: simplified common ndb client option handling ndb/src/common/mgmcommon/IPCConfig.cpp: added shared memory config parameter, signum for use in signalling ndb/src/common/portlib/NdbThread.c: added global variable for holdign signum to be used for shared memory connection only block signals if shared memory is used ndb/src/common/transporter/SHM_Transporter.cpp: use signum in new global variable for shared memory signalling ndb/src/common/transporter/TransporterRegistry.cpp: use signum in new global variable for shared memory signalling only fiddle with signals if it is set ndb/src/cw/cpcd/main.cpp: ndb_opts not really used ndb/src/kernel/vm/Configuration.cpp: simplified common ndb client option handling ndb/src/mgmclient/main.cpp: simplified common ndb client option handling ndb/src/mgmsrv/ConfigInfo.cpp: added shared memory config parameter, signum for use in signalling ndb/src/mgmsrv/main.cpp: simplified common ndb client option handling ndb/tools/delete_all.cpp: simplified common ndb client option handling ndb/tools/desc.cpp: simplified common ndb client option handling ndb/tools/drop_index.cpp: simplified common ndb client option handling ndb/tools/drop_tab.cpp: simplified common ndb client option handling ndb/tools/listTables.cpp: simplified common ndb client option handling ndb/tools/restore/restore_main.cpp: simplified common ndb client option handling ndb/tools/select_all.cpp: simplified common ndb client option handling ndb/tools/select_count.cpp: simplified common ndb client option handling ndb/tools/waiter.cpp: simplified common ndb client option handling
Diffstat (limited to 'ndb/src/cw/cpcd')
-rw-r--r--ndb/src/cw/cpcd/main.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/ndb/src/cw/cpcd/main.cpp b/ndb/src/cw/cpcd/main.cpp
index 300b51d7b5a..25632f132e9 100644
--- a/ndb/src/cw/cpcd/main.cpp
+++ b/ndb/src/cw/cpcd/main.cpp
@@ -15,7 +15,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <ndb_global.h> /* Needed for mkdir(2) */
-#include <ndb_opts.h>
+#include <my_sys.h>
+#include <my_getopt.h>
+#include <mysql_version.h>
+#include <ndb_version.h>
#include "CPCD.hpp"
#include "APIService.hpp"