diff options
| author | unknown <serg@serg.mylan> | 2004-11-15 19:27:06 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-15 19:27:06 +0100 |
| commit | 03d82a4652c82fb1930e0e515877e8fffbb0e5b0 (patch) | |
| tree | f8bc0b4f9899e5b4a5f848426d4568de1213e64b /configure.in | |
| parent | f3f73a48df66247e8c155fa429aeb1c42b2e7a55 (diff) | |
| parent | a59b0fbfd6b7627a4fdf2233482e732480dbe437 (diff) | |
| download | mariadb-git-03d82a4652c82fb1930e0e515877e8fffbb0e5b0.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
dbug/dbug.c:
Auto merged
include/my_dbug.h:
Auto merged
include/my_sys.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_isam.cc:
Auto merged
sql/ha_isammrg.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 5c322cf5394..d89d19179bd 100644 --- a/configure.in +++ b/configure.in @@ -480,7 +480,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 @@ -3063,9 +3063,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]) @@ -3104,7 +3110,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 @@ -3156,7 +3161,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl dbug/Makefile scripts/Makefile dnl include/Makefile sql-bench/Makefile tools/Makefile dnl server-tools/Makefile server-tools/instance-manager/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 |