mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
small fixes
mysql-test/ndb/ndbcluster.sh: use new shutdown command ndb/src/common/mgmcommon/Makefile.am: compile error fix
This commit is contained in:
@ -193,8 +193,7 @@ stop_default_ndbcluster() {
|
|||||||
|
|
||||||
exec_mgmtclient="$exec_mgmtclient --try-reconnect=1"
|
exec_mgmtclient="$exec_mgmtclient --try-reconnect=1"
|
||||||
|
|
||||||
echo "all stop" | $exec_mgmtclient 2>&1 | cat > /dev/null
|
echo "shutdown" | $exec_mgmtclient 2>&1 | cat > /dev/null
|
||||||
echo "3 stop" | $exec_mgmtclient 2>&1 | cat > /dev/null
|
|
||||||
|
|
||||||
if [ -f "$fs_ndb/$pidfile" ] ; then
|
if [ -f "$fs_ndb/$pidfile" ] ; then
|
||||||
kill -9 `cat "$fs_ndb/$pidfile"` 2> /dev/null
|
kill -9 `cat "$fs_ndb/$pidfile"` 2> /dev/null
|
||||||
|
@ -7,6 +7,8 @@ libmgmsrvcommon_la_SOURCES = \
|
|||||||
|
|
||||||
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/src/mgmsrv
|
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/src/mgmsrv
|
||||||
|
|
||||||
|
DEFS_LOC = -DNDB_BASE_PORT="\"@ndb_port_base@\""
|
||||||
|
|
||||||
include $(top_srcdir)/ndb/config/common.mk.am
|
include $(top_srcdir)/ndb/config/common.mk.am
|
||||||
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
|
||||||
include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
|
include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
|
||||||
|
Reference in New Issue
Block a user