From 1d3f4a1a490656378131d66cb507145e5141fbdd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 2 Nov 2004 17:53:25 -0700 Subject: Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROC for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself. configure.in: Portability fix for FIND_PROC setting; on Solaris (and probably others), 'ps -p $$' inside a shell script just returns 'sh' for command line, even though $0 contains the filename. So, use 'ps -fp $$' in the test (it shows the full command line, e.g., 'sh configure'). Leave the actual FIND_PROC command as-is, since mysqld itself is not a shell script. scripts/mysqld_safe.sh: Portability fix for mysqld_safe on non-Linux systems. A bogus use of 'if' and 'test' caused non-bash shells to enter a section meant to be run only on Linux systems. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index d4ede468435..97a59258ba8 100644 --- a/configure.in +++ b/configure.in @@ -444,7 +444,7 @@ if $PS p $$ 2> /dev/null | grep $0 > /dev/null then FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" # Solaris -elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null +elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null then FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" # BSD style -- cgit v1.2.1 From 0dd1ab1abbf81fef1ab9ebf43a06a1b0d0129487 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 4 Nov 2004 11:18:12 +0100 Subject: The files stored in "Docs/Images" within the "mysqldocs" BK tree must be included in the source tar-ball for distribution. This is done by using the "DISTFILES" macro in a new "Docs/Images/Makefile". As the source BK tree does not contain these files, they are copied from the "mysqldocs" tree at release build time. This changeset relies on "bk commit - mysqldoc tree (joerg:1.2276)" of today. Build-tools/Bootstrap: Copy the relevant files with "Docs/Images" from the "mysqldocs" BK tree into the build tree, ensuring that the "Makefile*" from the source BK tree are removed before. Docs/Images/Makefile.am: This dummy file is only needed to satisfy the Makefile hierarchy, at release build time it will be replaced by its counterpart from the "mysqldocs" BK tree. Docs/Makefile.am: Include the new "Docs/Images/Makefile" in the Makefile hierarchy. configure.in: Ensure that the autotools will handle the new "Docs/Images/Makefile.am". --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index d4ede468435..0c520ca8980 100644 --- a/configure.in +++ b/configure.in @@ -2711,7 +2711,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl merge/Makefile dbug/Makefile scripts/Makefile dnl include/Makefile sql-bench/Makefile tools/Makefile dnl - tests/Makefile Docs/Makefile support-files/Makefile dnl + tests/Makefile Docs/Makefile Docs/Images/Makefile support-files/Makefile dnl support-files/MacOSX/Makefile mysql-test/Makefile dnl netware/Makefile dnl include/mysql_version.h dnl -- cgit v1.2.1 From 5fb792ec40e438e9cd7918da37379ffc7b939f57 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 8 Nov 2004 10:21:39 +0000 Subject: removed editline and replaced with mysql readline created new facade object for CommandInterpreter removed CPC #if 0 code removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways BitKeeper/deleted/.del-MANIFEST~e8c948c4a4413f8d: Delete: ndb/src/common/editline/MANIFEST BitKeeper/deleted/.del-Makefile.am~dfbe493d6e2d25f4: Delete: ndb/src/common/editline/Makefile.am BitKeeper/deleted/.del-Makefile_old~90ac19a1668ecdd5: Delete: ndb/src/common/editline/Makefile_old BitKeeper/deleted/.del-README~3f39f9b8294466e8: Delete: ndb/src/common/editline/README BitKeeper/deleted/.del-complete.c~a1bc3055fd90e27f: Delete: ndb/src/common/editline/complete.c BitKeeper/deleted/.del-editline.3~1f9bb4274cf4381: Delete: ndb/src/common/editline/editline.3 BitKeeper/deleted/.del-editline.c~5b759f3e5fd3c196: Delete: ndb/src/common/editline/editline.c BitKeeper/deleted/.del-editline_internal.h~96ca8d53fb758586: Delete: ndb/src/common/editline/editline_internal.h BitKeeper/deleted/.del-editline_win32.c~45b257bec279826e: Delete: ndb/src/common/editline/editline_win32.c BitKeeper/deleted/.del-sysunix.c~8e7a6901783efd17: Delete: ndb/src/common/editline/sysunix.c BitKeeper/deleted/.del-unix.h~1c244c1d4ba6c6fb: Delete: ndb/src/common/editline/unix.h BitKeeper/deleted/.del-Makefile~46cecfa6cd1a4e6b: Delete: ndb/src/common/editline/test/Makefile BitKeeper/deleted/.del-testit.c~82837111b1876e44: Delete: ndb/src/common/editline/test/testit.c BitKeeper/deleted/.del-Makefile_old~59409aa4debaeb90: Delete: ndb/src/common/Makefile_old BitKeeper/deleted/.del-Makefile_old~92af3f5a7f24caf: Delete: ndb/src/mgmclient/Makefile_old ndb/test/src/CpcClient.cpp: Rename: ndb/src/mgmclient/CpcClient.cpp -> ndb/test/src/CpcClient.cpp ndb/test/include/CpcClient.hpp: Rename: ndb/src/mgmclient/CpcClient.hpp -> ndb/test/include/CpcClient.hpp configure.in: removed editline ndb/src/common/Makefile.am: removed editline ndb/src/mgmclient/CommandInterpreter.cpp: removed editline and replaced with mysql readline created new facade object for CommandInterpreter removed CPC #if 0 code ndb/src/mgmclient/Makefile.am: removed editline and replaced with mysql readline created new facade object for CommandInterpreter removed CPC #if 0 code ndb/src/mgmclient/main.cpp: removed editline and replaced with mysql readline created new facade object for CommandInterpreter removed CPC #if 0 code ndb/src/mgmclient/ndb_mgmclient.hpp: new facade object for CommandInterpreter ndb/src/mgmsrv/CommandInterpreter.hpp: removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways ndb/src/mgmsrv/Makefile.am: removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways ndb/test/run-test/Makefile.am: moved cpc code to test ndb/test/src/Makefile.am: moved cpc code to test ndb/test/tools/Makefile.am: moved cpc code to test --- configure.in | 1 - 1 file changed, 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 71adaa747f5..cd2daf10690 100644 --- a/configure.in +++ b/configure.in @@ -3093,7 +3093,6 @@ AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl ndb/src/common/logger/Makefile dnl ndb/src/common/transporter/Makefile dnl ndb/src/common/mgmcommon/Makefile dnl - ndb/src/common/editline/Makefile dnl ndb/src/kernel/Makefile dnl ndb/src/kernel/error/Makefile dnl ndb/src/kernel/blocks/Makefile dnl -- cgit v1.2.1 From b6ed85ba5a884145723058344571b682de3f4c9e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 10 Nov 2004 16:05:28 +0000 Subject: added configure switch for ndb port number added new variable for ndb port 1186 changed meaning of ndb_port_base to be default tcp port setting changed to use split between port and port_base for ndbcluster so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster added larger space to pid print moved readAndExecute out of CommandInterpreter to avoid linking lib with readline added c-api to Ndb_mgmclient pass also ndb_port to make acinclude.m4: added configure switch for ndb port number configure.in: added new variable for ndb port 1186 changed meaning of ndb_port_base to be default tcp port setting mysql-test/mysql-test-run.sh: changed to use split between port and port_base for ndbcluster mysql-test/ndb/Makefile.am: so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster mysql-test/ndb/ndbcluster.sh: so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster ndb/src/common/mgmcommon/LocalConfig.cpp: so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster ndb/src/common/mgmcommon/Makefile.am: so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster ndb/src/common/mgmcommon/NdbConfig.c: added larger space to pid print ndb/src/mgmclient/CommandInterpreter.cpp: moved readAndExecute out of CommandInterpreter to avoid linking lib with readline added c-api to Ndb_mgmclient ndb/src/mgmclient/main.cpp: moved readAndExecute out of CommandInterpreter to avoid linking lib with readline ndb/src/mgmclient/ndb_mgmclient.hpp: moved readAndExecute out of CommandInterpreter to avoid linking lib with readline ndb/src/mgmsrv/ConfigInfo.cpp: moved readAndExecute out of CommandInterpreter to avoid linking lib with readline ndb/src/mgmsrv/Makefile.am: pass also ndb_port to make --- configure.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index cd2daf10690..764261c6933 100644 --- a/configure.in +++ b/configure.in @@ -3052,9 +3052,15 @@ AC_SUBST([NDB_DEFS]) AC_SUBST([ndb_cxxflags_fix]) +if test X"$ndb_port" = Xdefault +then + ndb_port="1186" +fi +AC_SUBST([ndb_port]) + if test X"$ndb_port_base" = Xdefault then - ndb_port_base="2200" + ndb_port_base="2202" fi AC_SUBST([ndb_port_base]) -- cgit v1.2.1