Portability fixes

Docs/manual.texi

@@ -2441,6 +2441,9 @@ New Client libraries for the Mac OS Classic (Macintosh).
 
 @item @uref{http://www.lilback.com/macsql/}
 Client libraries for Mac OS Classic (Macintosh).
+
+@item @uref{http://mapage.noos.fr/vpenvern01/index_en.html}
+MySQL for Amiga
 @end table
 
 @subheading Perl-related Links
@@ -5009,6 +5012,8 @@ sucessfully on the following operating system/thread package combinations:
 @item
 AIX 4.x with native threads.  @xref{IBM-AIX}.
 @item
+Amiga.
+@item
 BSDI 2.x with the included MIT-pthreads package.  @xref{BSDI}.
 @item
 BSDI 3.0, 3.1 and 4.x with native threads.  @xref{BSDI}.
@@ -31643,6 +31648,21 @@ feature. It just installs the @code{mysqld-max} executable and
 @code{safe_mysqld} will automaticly use this executable when
 @code{safe_mysqld} is restarted.
 
+The following table shows which table types our standard @strong{MySQL-Max}
+binaries includes:
+
+@multitable @columnfractions .4 .3 .3
+@item @strong{System} @tab @strong{BDB} @tab @strong{InnoDB}
+@item AIX 4.3 @tab N @tab Y
+@item HPUX 11.0 @tab N @tab Y
+@item Linux-Alpha @tab N	@tab Y
+@item Linux-Intel @tab Y @tab Y
+@item Solaris-intel @tab N @tab Y
+@item Solaris-sparc @tab Y @tab Y
+@item SCO OSR5 @tab Y @tab Y
+@item UnixWare @tab Y @tab Y
+@end multitable
+
 @cindex tools, safe_mysqld
 @cindex scripts
 @cindex @code{safe_mysqld}
@@ -42847,13 +42867,13 @@ of several databases simultaneously. By Innovative-IT Development AB.
 @item @uref{http://www.mysql.com/downloads/gui-clients.html, MySQLGUI}
 The @strong{MySQL} GUI client homepage. By Sinisa at @strong{MySQL AB}.
 
-@item @uref{http://www.mysql.com/downloads/gui-clients.html, MySQL navigator}
+@item @uref{http://www.mysql.com/Downloads/Contrib/mysql_navigator_0.9.0.tar.gz, MySQL navigator 0.9}
 MySQL Navigator is MySQL database server GUI client program. The purpose
 of MySQL Navigator is to provide a useful client interface to MySQL
 database servers, whilst supporting multiple operating systems and
 languages. You can currently import/export database, enter queries, get
 result sets, edit scripts, run scripts, add, alter, and delete users,
-and retrieve client and server information. GPL.
+and retrieve client and server information. Uses QT 2.2. GPL
 @uref{http://sql.kldp.org/mysql, Home page for MySQL Navigator}.
 
 @item @uref{http://www.mysql.com/Downloads/Win32/secman.zip,  MySQL Security GUI}

acinclude.m4

@@ -930,6 +930,7 @@ dnl circular references.
  ../innobase/odbc/libodbc.a\
  ../innobase/srv/libsrv.a\
  ../innobase/que/libque.a\
+ ../innobase/srv/libsrv.a\
  ../innobase/dict/libdict.a\
  ../innobase/ibuf/libibuf.a\
  ../innobase/row/librow.a\

include/m_ctype.h

@@ -66,6 +66,7 @@ extern CHARSET_INFO  compiled_charsets[];
 #endif
 /* Don't include std ctype.h when this is included */
 #define _CTYPE_H
+#define _CTYPE_H_
 #define _CTYPE_INCLUDED
 #define __CTYPE_INCLUDED
 #define _CTYPE_USING   /* Don't put names in global namespace. */

innobase/configure.in

@@ -4,6 +4,33 @@ AC_CANONICAL_SYSTEM
 AM_MAINTAINER_MODE
 AM_CONFIG_HEADER(ib_config.h)
 AM_INIT_AUTOMAKE(ib, 0.90)
+
+# This is need before AC_PROG_CC
+#
+
+if test "x${CFLAGS-}" = x ; then
+  cflags_is_set=no
+else
+  cflags_is_set=yes
+fi
+
+if test "x${CPPFLAGS-}" = x ; then
+  cppflags_is_set=no
+else
+  cppflags_is_set=yes
+fi
+
+if test "x${LDFLAGS-}" = x ; then
+  ldflags_is_set=no
+else
+  ldflags_is_set=yes
+fi
+
+# The following hack should ensure that configure doesn't add optimizing
+# or debugging flags to CFLAGS or CXXFLAGS
+CFLAGS="$CFLAGS "
+CXXFLAGS="$CXXFLAGS "
+
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_PROG_INSTALL
@@ -60,6 +87,8 @@ case "$target_os" in
 	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
        irix*)
 	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
+       osf*)
+	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
        sysv5uw7*)
 	 # Problem when linking on SCO
 	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;