Commit 566f8236 authored by monty@donna.mysql.fi's avatar monty@donna.mysql.fi
Browse files

Portability fixes

parent f113a7fd
Loading
Loading
Loading
Loading
+28 −0
Original line number Diff line number Diff line
@@ -31600,6 +31600,34 @@ the following configure options:
@item CFLAGS=-DUSE_SYMDIR @tab Symbolic links support for Windows.
@end multitable
Note that as Berkeley DB and InnoDB are not available for all platforms,
some of the @code{Max} binaries may not have support for both of these.
You can check which table types are supported by doing the following
query:
@example
mysql> show variables like "have_%";
+---------------+-------+
| Variable_name | Value |
+---------------+-------+
| have_bdb      | YES   |
| have_gemini   | NO    |
| have_innodb   | NO    |
| have_isam     | YES   |
| have_raid     | YES   |
| have_ssl      | NO    |
+---------------+-------+
@end example
The meaning of the values are:
@multitable @columnfractions .3 .7
@item @strong{Value} @tab @strong{Meaning}.
@item YES @tab The option is activated and usable.
@item NO @tab @strong{MySQL} is not compiled with support for this option.
@item DISABLED @tab The xxxx option is disabled because one started @code{mysqld} with @code{--skip-xxxx} or because one didn't start @code{mysqld} with all needed options to enable the option.  In this case the @code{hostname.err} file should contain a reason for why the option is disabled.
@end multitable
@code{safe_mysqld} will automaticly try to start any @code{mysqld} binary
with the @code{-max} prefix. This makes it very easy to test out a
another @code{mysqld} binary in an existing installation.  Just
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
AM_INIT_AUTOMAKE(mysql, 3.23.37)
AM_INIT_AUTOMAKE(mysql, 3.23.38)
AM_CONFIG_HEADER(config.h)

PROTOCOL_VERSION=10
+44 −0
Original line number Diff line number Diff line
@@ -13,9 +13,53 @@ AC_CHECK_FUNCS(sched_yield)
AC_C_INLINE
AC_C_BIGENDIAN

# Build optimized or debug version ?
# First check for gcc and g++
if test "$ac_cv_prog_gcc" = "yes"
then
  DEBUG_CFLAGS="-g"
  DEBUG_OPTIMIZE_CC="-O"
  OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
else
  DEBUG_CFLAGS="-g"
  DEBUG_OPTIMIZE_CC=""
  OPTIMIZE_CFLAGS="-O"
fi
if test "$ac_cv_prog_cxx_g" = "yes"
then
  DEBUG_CXXFLAGS="-g"
  DEBUG_OPTIMIZE_CXX="-O"
  OPTIMIZE_CXXFLAGS="-O3"
else
  DEBUG_CXXFLAGS="-g"
  DEBUG_OPTIMIZE_CXX=""
  OPTIMIZE_CXXFLAGS="-O"
fi
AC_ARG_WITH(debug,
    [  --without-debug         Build a production version without debugging code],
    [with_debug=$withval],
    [with_debug=no])
if test "$with_debug" = "yes"
then
  # Medium debug.
  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"
  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
elif test "$with_debug" = "full"
then
  # Full debug. Very slow in some cases
  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
else
  # Optimized version. No debug
  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
  CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
fi

case "$target_os" in
       hp*) AC_DEFINE(UNIV_MUST_NOT_INLINE, 1,
	                     No inlining because gcc broken on HP-UX);;
       *sgi-irix*) AC_DEFINE(UNIV_MUST_NOT_INLINE, 1,
	                     No inlining because cc broken on irix);;
esac

AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile
+6 −0
Original line number Diff line number Diff line
@@ -11,9 +11,15 @@
/* The number of bytes in a int.  */
#define SIZEOF_INT 4

/* Define if you have the sched_yield function.  */
#define HAVE_SCHED_YIELD 1

/* Define if you have the <aio.h> header file.  */
#define HAVE_AIO_H 1

/* Define if you have the <sched.h> header file.  */
#define HAVE_SCHED_H 1

/* Name of package */
#define PACKAGE "ib"

+6 −0
Original line number Diff line number Diff line
@@ -10,9 +10,15 @@
/* The number of bytes in a int.  */
#undef SIZEOF_INT

/* Define if you have the sched_yield function.  */
#undef HAVE_SCHED_YIELD

/* Define if you have the <aio.h> header file.  */
#undef HAVE_AIO_H

/* Define if you have the <sched.h> header file.  */
#undef HAVE_SCHED_H

/* Name of package */
#undef PACKAGE

Loading