Skip to content

M
mariadb
Commit b9d3a552 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files
Options

Update needed for SuSE 7.3 

Update for autoconf 2.52
parent a880ec94
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 411 additions and 295 deletions
BUILD/Makefile.am
View file @ b9d3a552
......@@ -35,7 +35,6 @@ EXTRA_DIST = FINISH.sh \
compile-pentium-myodbc \
compile-pentium-mysqlfs-debug \
compile-pentium-pgcc \
compile-pentium-symbols \
compile-solaris-sparc \
compile-solaris-sparc-debug \
compile-solaris-sparc-fortre \
......
BUILD/SETUP.sh
View file @ b9d3a552
......@@ -52,8 +52,8 @@ debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O1"
base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static \
--with-client-ldflags=-all-static"
base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client"
static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"
alpha_configs="" # Not used yet
pentium_configs=""
sparc_configs=""
......
BUILD/compile-alpha
View file @ b9d3a552
......@@ -4,6 +4,6 @@ path=`dirname $0`
. "$path/SETUP.sh"
extra_flags="$alpha_cflags $fast_cflags"
extra_configs="$alpha_configs"
extra_configs="$alpha_configs $static_link"
. "$path/FINISH.sh"
BUILD/compile-pentium
View file @ b9d3a552
......@@ -4,9 +4,7 @@ path=`dirname $0`
. "$path/SETUP.sh"
extra_flags="$pentium_cflags $fast_cflags"
extra_configs="$pentium_configs"
extra_configs="$pentium_configs $static_link"
strip=yes
extra_configs="$extra_configs"
. "$path/FINISH.sh"
BUILD/compile-pentium-debug-no-bdb
View file @ b9d3a552
......@@ -4,6 +4,6 @@ path=`dirname $0`
. "$path/SETUP.sh"
extra_flags="$pentium_cflags $debug_cflags"
extra_configs="$pentium_configs $debug_configs --without-berkeley-db"
extra_configs="$pentium_configs $debug_configs --without-berkeley-db $static_link"
. "$path/FINISH.sh"
BUILD/compile-pentium-gcov
View file @ b9d3a552
......@@ -4,6 +4,6 @@ path=`dirname $0`
. "$path/SETUP.sh"
extra_flags="$pentium_cflags -O2 -fprofile-arcs -ftest-coverage"
extra_configs="$pentium_configs $debug_configs --disable-shared"
extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
. "$path/FINISH.sh"
BUILD/compile-pentium-gprof
View file @ b9d3a552
......@@ -4,6 +4,6 @@ path=`dirname $0`
. "$path/SETUP.sh"
extra_flags="$pentium_cflags -O2 -pg -g"
extra_configs="$pentium_configs $debug_configs --disable-shared"
extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
. "$path/FINISH.sh"
BUILD/compile-pentium-mysqlfs-debug
View file @ b9d3a552
......@@ -6,7 +6,7 @@ path=`dirname $0`
extra_flags="$pentium_cflags $debug_cflags"
c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs"
extra_configs="$pentium_configs $debug_configs $static_link"
extra_configs="$extra_configs --with-debug=full --with-mysqlfs --without-server --without-pstack"
......
BUILD/compile-pentium-symbols deleted 100755 → 0
View file @ a880ec94
#! /bin/sh
path=`dirname $0`
. "$path/SETUP.sh"
extra_flags="$pentium_cflags $fast_cflags -g"
extra_configs="$pentium_configs"
# Use the optimized version if it exists
if test -d /usr/local/BerkeleyDB-opt/
then
extra_configs="$extra_configs --with-berkeley-db=/usr/local/BerkeleyDB-opt/"
fi
. "$path/FINISH.sh"
Docs/manual.texi
View file @ b9d3a552
......@@ -566,7 +566,7 @@ a commercial memory leakage detector.
@item
Works on many different platforms. @xref{Which OS}.
@item
Uses GNU Automake, Autoconf, and Libtool for portability.
Uses GNU Automake, Autoconf (Ver 2.52 or newer), and Libtool for portability.
@item
APIs for C, C++, Eiffel, Java, Perl, PHP, Python and Tcl. @xref{Clients}.
@item
......@@ -29572,7 +29572,7 @@ mysql> select MOD(29,9);
* String functions:: String functions
* Numeric Functions:: Numeric Functions
* Date and time functions:: Date and time functions
* Cast Functions::
* Cast Functions:: Cast Functions
* Other Functions:: Other Functions
* Group by functions:: Functions for Use with @code{GROUP BY} Clauses
@end menu
......@@ -48267,6 +48267,14 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@itemize @bullet
@item
Added detection if @code{nan} values in MyISAM to make it possible to
repair tables with @code{nan} in float or double columns.
@item
Fixed new bug in @code{myisamchk} where it didn't correctly update number of
'parts' in the MyISAM index file.
@item
Changed to use autoconf 2.52 (from Autconf 2.13).
@item
Fixed optimization problem where a MySQL was a long time in a
"preparing" state when selecting from an empty table which had contained
a lot of rows.
Docs/mysqld_error.txt
View file @ b9d3a552
This diff is collapsed.
acconfig.h
View file @ b9d3a552
......@@ -14,6 +14,10 @@
Leave the following blank line there!! Autoheader needs it. */
#undef C_ALLOCA
#undef CRAY_STACKSEG_END
/* Version of .frm files */
#undef DOT_FRM_VERSION
......@@ -38,6 +42,9 @@
/* atomic_sub() from <asm/atomic.h> (Linux only) */
#undef HAVE_ATOMIC_SUB
/* If we have a working alloca() implementation */
#undef HAVE_ALLOCA
/* bool is not defined by all C++ compilators */
#undef HAVE_BOOL
......@@ -224,6 +231,8 @@
/* Needed to get large file supportat HPUX 10.20 */
#undef __STDC_EXT__
#undef STACK_DIRECTION
#undef STRCOLL_BROKEN
#undef STRUCT_DIRENT_HAS_D_FILENO
......
acinclude.m4
View file @ b9d3a552
......@@ -315,14 +315,6 @@ case "x$am_cv_prog_cc_stdc" in
esac
])
# serial 1
AC_DEFUN(AM_PROG_INSTALL,
[AC_REQUIRE([AC_PROG_INSTALL])
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
AC_SUBST(INSTALL_SCRIPT)dnl
])
#
# Check to make sure that the build environment is sane.
#
......@@ -527,7 +519,7 @@ fi
])dnl
AC_DEFUN(MYSQL_STACK_DIRECTION,
AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
[AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
[AC_TRY_RUN([find_stack_direction ()
{
static char *addr = 0;
......@@ -546,7 +538,7 @@ AC_DEFUN(MYSQL_STACK_DIRECTION,
}], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
ac_cv_c_stack_direction=0)])
AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
)dnl
])dnl
AC_DEFUN(MYSQL_FUNC_ALLOCA,
[
......@@ -643,7 +635,8 @@ AC_MSG_RESULT($ac_cv_conv_longlong_to_float)
])
AC_DEFUN(MYSQL_CHECK_CPU,
AC_CACHE_CHECK([if compiler supports optimizations for current cpu], mysql_cv_cpu,[
[AC_CACHE_CHECK([if compiler supports optimizations for current cpu],
mysql_cv_cpu,[
ac_save_CFLAGS="$CFLAGS"
if test -r /proc/cpuinfo ; then
......@@ -686,7 +679,7 @@ then
else
AC_MSG_RESULT($mysql_cv_cpu)
fi
]))
]]))
AC_DEFUN(MYSQL_CHECK_VIO, [
AC_ARG_WITH([vio],
......@@ -755,7 +748,19 @@ AC_MSG_CHECKING(for OpenSSL)
openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto"
openssl_includes="-I$OPENSSL_INCLUDE"
AC_DEFINE(HAVE_OPENSSL)
else
# openssl-devel-0.9.6 requires dlopen() and we can't link staticly
# on many platforms (We should actually test this here, but it's quite
# hard) to do as we are doing libtool for linking.
using_static=""
case "$CLIENT_EXTRA_LDFLAGS $MYSQLD_EXTRA_LDFLAGS" in
*-all-static*) using_static="yes" ;;
esac
if test $using_static = "yes"
then
echo "You can't use the --all-static link option when using openssl."
exit 1
fi
AC_MSG_RESULT(no)
fi
NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs"
......@@ -1258,9 +1263,9 @@ changequote([, ])dnl
AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])
fi])
AC_DEFUN(AC_SYS_LARGEFILE,
AC_DEFUN(MYSQL_SYS_LARGEFILE,
[AC_REQUIRE([AC_CANONICAL_HOST])
AC_ARG_ENABLE(largefile,
AC_ARG_ENABLE(largefile,
[ --disable-largefile Omit support for large files])
if test "$enable_largefile" != no; then
AC_CHECK_TOOL(GETCONF, getconf)
......
bdb/dist/configure.in
View file @ b9d3a552
......@@ -21,9 +21,7 @@ AC_SUBST(ADDITIONAL_LANG)
AC_SUBST(ADDITIONAL_LIBS)
AC_SUBST(ADDITIONAL_OBJS)
AC_SUBST(ADDITIONAL_PROGS)
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(CXX)
AC_SUBST(CXXFLAGS)
AC_SUBST(DBS_LIBS)
AC_SUBST(DEFAULT_INSTALL)
......@@ -145,55 +143,6 @@ osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
*qnx) AC_DEFINE(HAVE_QNX);;
sco3.2v4*) CC=${CC-"cc -belf"}
LIBS="-lsocket -lnsl_s $LIBS";;
sco3.2v5*) if test "$GCC" != "yes"; then
CFLAGS="$CFLAGS"
LD='$(CC) $(CFLAGS)'
LIBS="-lsocket -lnsl $LIBS"
CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS"
case "$CFLAGS" in
*-belf*)
AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
case "$LDFLAGS" in
*-belf*) ;;
*) echo "Adding -belf option to ldflags."
LDFLAGS="$LDFLAGS -belf"
;;
esac
])
;;
*)
AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
case "$LDFLAGS" in
*-belf*) ;;
*)
echo "Adding -belf option to ldflags."
LDFLAGS="$LDFLAGS -belf"
;;
esac
])
;;
esac
else
CC="gcc"
LIBS="-lsocket -lnsl $LIBS"
CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS"
fi
;;
sysv5uw7*) LIBS="-lsocket -lnsl $LIBS"
if test "$GCC" != "yes"; then
# We are using built-in inline function
CC="cc -belf"
CXX="CC -belf"
CFLAGS="$CFLAGS -Kalloca -Kthread"
CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
LIBS="-Kthread -lsocket -lnsl $LIBS"
else
CFLAGS="$CFLAGS -Kalloca -pthread"
CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS"
LIBS="-pthread -lsocket -lnsl $LIBS"
fi
;;
sco*) CC=${CC-"cc -belf"}
LIBS="-lsocket -lnsl $LIBS";;
solaris*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
......@@ -281,6 +230,59 @@ if test "$GXX" = "yes"; then
esac
fi
dnl Give the OS a last chance to override CFLAGS and LDFLAGS
case "$host_os" in
sco3.2v5*)
if test "$GCC" != "yes"; then
CFLAGS="$CFLAGS"
LD='$(CC) $(CFLAGS)'
LIBS="-lsocket -lnsl $LIBS"
CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS"
case "$CFLAGS" in
*-belf*)
AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
case "$LDFLAGS" in
*-belf*) ;;
*) echo "Adding -belf option to ldflags."
LDFLAGS="$LDFLAGS -belf"
;;
esac
])
;;
*)
AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
case "$LDFLAGS" in
*-belf*) ;;
*)
echo "Adding -belf option to ldflags."
LDFLAGS="$LDFLAGS -belf"
;;
esac
])
;;
esac
else
CC="gcc"
LIBS="-lsocket -lnsl $LIBS"
CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS"
fi ;;
sysv5uw7*) LIBS="-lsocket -lnsl $LIBS"
if test "$GCC" != "yes"; then
# We are using built-in inline function
CC="cc -belf"
CXX="CC -belf -DNO_CPLUSPLUS_ALLOCA"
CFLAGS="$CFLAGS -Kalloca -Kthread"
LIBS="-Kthread -lsocket -lnsl $LIBS"
else
CFLAGS="$CFLAGS -Kalloca -pthread"
CXX="$CXX -DNO_CPLUSPLUS_ALLOCA"
CPPFLAGS="-D_THREAD_SAFE -pthread $CPPFLAGS"
LIBS="-pthread -lsocket -lnsl $LIBS"
fi
;;
esac
dnl Export our compiler preferences for the libtool configuration.
export CC CCC
CCC=CXX
......
configure.in
View file @ b9d3a552
......@@ -87,7 +87,7 @@ AC_SUBST(CXXLDFLAGS)
AC_PREREQ(2.12)dnl Minimum Autoconf version required.
AM_MAINTAINER_MODE
AC_ARG_PROGRAM
#AC_ARG_PROGRAM # Automaticly invoked by AM_INIT_AUTOMAKE
AM_SANITY_CHECK
# This is needed is SUBDIRS is set
AC_PROG_MAKE_SET
......@@ -151,8 +151,10 @@ AM_PROG_LIBTOOL
#AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL AC_DISABLE_FAST_INSTALL AC_DISABLE_SHARED AC_DISABLE_STATIC
# AC_PROG_INSTALL We should only need a AM_PROG_INSTALL
# AC_PROG_INSTALL
AC_PROG_INSTALL
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
# Not critical since the generated file is distributed
AC_PROG_YACC
AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
......@@ -185,7 +187,8 @@ AC_DEFINE(SPRINTF_RETURNS_INT) AC_MSG_RESULT("int"),
AC_DEFINE(SPRINTF_RETURNS_GARBAGE) AC_MSG_RESULT("garbage")))
# option, cache_name, variable
# option, cache_name, variable,
# code to execute if yes, code to exectute if fal
AC_DEFUN(AC_SYS_COMPILER_FLAG,
[
AC_MSG_CHECKING($1)
......@@ -294,6 +297,7 @@ AC_SUBST(CFLAGS)
AC_SUBST(CXX)
AC_SUBST(CXXFLAGS)
AC_SUBST(LD)
AC_SUBST(INSTALL_SCRIPT)
export CC CFLAGS LD LDFLAGS
......@@ -579,9 +583,8 @@ AC_ARG_WITH(mysqld-user,
)
AC_SUBST(MYSQLD_USER)
# Use Paul Eggerts macros from GNU tar to check for large file
# support.
AC_SYS_LARGEFILE
# Use Paul Eggerts macros from GNU tar to check for large file support.
MYSQL_SYS_LARGEFILE
# Types that must be checked AFTER large file support is checked
AC_TYPE_SIZE_T
......@@ -1482,7 +1485,7 @@ MYSQL_TYPE_QSORT
AC_FUNC_UTIME_NULL
AC_FUNC_VPRINTF
AC_CHECK_FUNCS(alarm bmove \
chsize ftruncate rint finite fpsetmask fpresetsticky\
chsize ftruncate rint finite isnan fpsetmask fpresetsticky\
cuserid fcntl fconvert poll \
getrusage getpwuid getcwd getrlimit getwd index stpcpy locking longjmp \
perror pread realpath readlink rename \
......
myisam/mi_check.c
View file @ b9d3a552
......@@ -2355,7 +2355,7 @@ static int sort_get_next_record(SORT_INFO *sort_info)
continue;
}
if (!sort_info->fix_datafile && (b_type & BLOCK_DELETED))
if (!sort_info->fix_datafile)
share->state.split++;
if (! found_record++)
{
......
myisam/mi_key.c
View file @ b9d3a552
......@@ -18,6 +18,9 @@
#include "myisamdef.h"
#include "m_ctype.h"
#ifdef HAVE_IEEEFP_H
#include <ieeefp.h>
#endif
#define CHECK_KEYS
......@@ -88,25 +91,28 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
}
else if (keyseg->flag & HA_SWAP_KEY)
{ /* Numerical column */
#ifdef NAN_TEST
float float_nr;
double dbl_nr;
#ifdef HAVE_ISNAN
if (type == HA_KEYTYPE_FLOAT)
{
float_nr=float4get(pos);
if (float_nr == (float) FLT_MAX)
float nr;
float4get(nr,pos);
if (isnan(nr))
{
float_nr= (float) FLT_MAX;
pos= (byte*) &float_nr;
/* Replace NAN with zero */
bzero(key,length);
key+=length;
continue;
}
}
else if (type == HA_KEYTYPE_DOUBLE)
{
dbl_nr=float8get(key);
if (dbl_nr == DBL_MAX)
double nr;
float8get(nr,pos);
if (isnan(nr))
{
dbl_nr=DBL_MAX;
pos=(byte*) &dbl_nr;
bzero(key,length);
key+=length;
continue;
}
}
#endif
......
scripts/Makefile.am
View file @ b9d3a552
......@@ -76,7 +76,7 @@ CLEANFILES = @server_scripts@ \
SUPERCLEANFILES = mysqlbug
# We want the right version and configure comand line in mysqlbug
mysqlbug: ${top_builddir}/config.status ${top_builddir}/config.cache mysqlbug.sh
mysqlbug: ${top_builddir}/config.status mysqlbug.sh
SUFFIXES = .sh
......
scripts/mysql_new_fix_privilege_tables.sh
View file @ b9d3a552
......@@ -17,8 +17,9 @@ echo ""
echo "If your tables are already up to date or partially up to date you will"
echo "get some warnings about 'Duplicated column name'. You can safely ignore these!"
# Add fields that can be used to limit number of questions and connections
# for some users.
@bindir@/mysql -f --user=root --password="$root_password" --host="$host" mysql <<END_OF_DATA
alter table user add max_questions int(11) unsigned DEFAULT 0 NOT NULL;
alter table user add max_updates int(11) unsigned DEFAULT 0 NOT NULL;
alter table user add max_connections int(11) unsigned DEFAULT 0 NOT NULL;
alter table user add max_questions int(11) NOT NULL, add max_updates int(11) unsigned NOT NULL, add max_connections int(11) unsigned NOT NULL;
END_OF_DATA
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7