diff options
| -rwxr-xr-x | Build-tools/Do-rpm | 7 | ||||
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | acinclude.m4 | 17 | ||||
| -rw-r--r-- | configure.in | 22 | ||||
| -rw-r--r-- | include/my_global.h | 1 | ||||
| -rwxr-xr-x | libmysqld/examples/test-run | 2 | ||||
| -rw-r--r-- | sql/Makefile.am | 3 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 2 |
8 files changed, 47 insertions, 10 deletions
diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm index 09e141184c8..123f6332398 100755 --- a/Build-tools/Do-rpm +++ b/Build-tools/Do-rpm @@ -5,6 +5,7 @@ function copy_to_bmachine { if [ x$local_build = x1 ]; then + rm -f $2 cp $1 $2 else scp $1 $owner@$bmachine:$2 @@ -14,6 +15,7 @@ function copy_to_bmachine function copy_from_bmachine { if [ x$local_build = x1 ]; then + rm -f $2 cp $1 $2 else scp $owner@$bmachine:$1 $2 @@ -102,10 +104,11 @@ if [ ! -f "$tarball" ]; then exit 1 fi -echo "Building RPM for MySQL version $VER on $bmachine" - log=$logdir/Log-RPM-`date +%y%m%d-%H%M` +echo "Building RPM for MySQL version $VER on $bmachine" +echo "Details in $log" + ( set -x # remove old stuff diff --git a/acconfig.h b/acconfig.h index 341de4a2ceb..1e62d2a4248 100644 --- a/acconfig.h +++ b/acconfig.h @@ -81,6 +81,9 @@ /* Using Innobase DB */ #undef HAVE_INNOBASE_DB +/* Using old ISAM tables */ +#undef HAVE_ISAM + /* Define if we have GNU readline */ #undef HAVE_LIBREADLINE diff --git a/acinclude.m4 b/acinclude.m4 index 1cfd80ea5ed..fe2ef07b61d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -814,6 +814,23 @@ AC_SUBST(orbit_libs) AC_SUBST(orbit_idl) ]) +AC_DEFUN([MYSQL_CHECK_ISAM], [ + AC_ARG_WITH([isam], [\ + --without-isam Disable the ISAM table type], + [with_isam="$withval"], + [with_isam=yes]) + + isam_libs= + if test X"$with_isam" = X"yes" + then + AC_DEFINE(HAVE_ISAM) + isam_libs="\$(top_builddir)/isam/libnisam.a\ + \$(top_builddir)/merge/libmerge.a" + fi + AC_SUBST(isam_libs) +]) + + dnl --------------------------------------------------------------------------- dnl Macro: MYSQL_CHECK_BDB dnl Sets HAVE_BERKELEY_DB if inst library is found diff --git a/configure.in b/configure.in index 35a3b54339c..4e22e4db664 100644 --- a/configure.in +++ b/configure.in @@ -2075,6 +2075,7 @@ EOF AC_MSG_RESULT([default: $default_charset; compiled in: $CHARSETS]) +MYSQL_CHECK_ISAM MYSQL_CHECK_BDB MYSQL_CHECK_INNODB @@ -2106,12 +2107,23 @@ then AC_SUBST(THREAD_LPROGRAMS) THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o" AC_SUBST(THREAD_LOBJECTS) - sql_server_dirs="strings dbug mysys extra regex isam merge myisam myisammrg heap vio sql" server_scripts="mysqld_safe mysql_install_db" + sql_server_dirs="strings dbug mysys extra regex" + + + # + # Configuration for optional table handlers + # + + if test X"$have_isam" != Xno + then + sql_server_dirs="$sql_server_dirs isam merge" + fi + if test X"$have_berkeley_db" != Xno; then if test X"$have_berkeley_db" != Xyes; then # we must build berkeley db from source - sql_server_dirs="$have_berkeley_db $sql_server_dirs" + sql_server_dirs="$sql_server_dirs $have_berkeley_db" echo "CONFIGURING FOR BERKELEY DB" bdb_conf_flags= @@ -2178,7 +2190,7 @@ EOF if test X"$have_innodb" = Xyes then - sql_server_dirs="innobase $sql_server_dirs" + sql_server_dirs="$sql_server_dirs innobase" echo "CONFIGURING FOR INNODB" if test ! -d "innobase"; then # This should only happen when doing a VPATH build @@ -2195,6 +2207,10 @@ EOF echo "END OF INNODB CONFIGURATION" fi + # + # END of configuration for optional table handlers + # + sql_server_dirs="$sql_server_dirs myisam myisammrg heap vio sql" if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes" then diff --git a/include/my_global.h b/include/my_global.h index 5fc575f7ada..09956254ac4 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -453,7 +453,6 @@ typedef SOCKET_SIZE_TYPE size_socket; /* Some things that this system doesn't have */ #define ONLY_OWN_DATABASES /* We are using only databases by monty */ -#define HAVE_ISAM /* TO BE DELETED */ #define NO_HASH /* Not needed anymore */ #ifdef __WIN__ #define NO_DIR_LIBRARY /* Not standar dir-library */ diff --git a/libmysqld/examples/test-run b/libmysqld/examples/test-run index b97d2742b74..d525c7a14a3 100755 --- a/libmysqld/examples/test-run +++ b/libmysqld/examples/test-run @@ -37,7 +37,7 @@ usage: $0 [-g|-h|-r] [test-name ...] EOF } -init_args="" +init_args="--server-arg=--language=$top_builddir/sql/share/english" while test $# -gt 0 do arg= diff --git a/sql/Makefile.am b/sql/Makefile.am index a1e82b2844a..cf762d9f6df 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -30,8 +30,7 @@ SUBDIRS = share libexec_PROGRAMS = mysqld noinst_PROGRAMS = gen_lex_hash gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ -LDADD = ../isam/libnisam.a \ - ../merge/libmerge.a \ +LDADD = @isam_libs@ \ ../myisam/libmyisam.a \ ../myisammrg/libmyisammrg.a \ ../heap/libheap.a \ diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index e62b8e84f9b..fcce92def24 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -148,7 +148,7 @@ Summary(pt_BR): MySQL - Medições de desempenho Group(pt_BR): Aplicações/Banco_de_Dados Obsoletes: embedded -%description devel +%description embedded This package contains the MySQL server as library. %{see_base} |