Add --without-isam configure switch.

Portability fix for mysqlmanager.

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
 

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

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
 MYSQL_CHECK_GEMINI
@@ -2107,12 +2108,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=
@@ -2179,7 +2191,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
@@ -2198,7 +2210,7 @@ EOF
   fi
 
   if test "X$have_gemini_db" = "Xyes"; then 
-    sql_server_dirs="gemini $sql_server_dirs"
+    sql_server_dirs="$sql_server_dirs gemini"
     echo "CONFIGURING FOR GEMINI DB"
     (cd gemini && sh ./configure) \
     || AC_MSG_ERROR([could not configure Gemini DB])
@@ -2208,6 +2220,12 @@ EOF
     AC_DEFINE(HAVE_GEMINI_DB)
   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
     # MIT user level threads

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 */

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=

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 \

tools/mysqlmanager.c

@@ -42,6 +42,7 @@
 #include <violite.h>
 #include <my_pthread.h>
 #include <md5.h>
+#include <signal.h>
 
 #define MANAGER_VERSION "1.0"
 #define MANAGER_GREETING "MySQL Server Management Daemon v. 1.0"