mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Fixed error when copying mysqld_multi
Fixes for mysql-test Fixed race condition in SHOW LOGS
This commit is contained in:
parent
bed1668e23
commit
5cce198b69
8 changed files with 44 additions and 25 deletions
18
configure.in
18
configure.in
|
|
@ -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.29-gamma)
|
||||
AM_INIT_AUTOMAKE(mysql, 3.23.29a-gamma)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
PROTOCOL_VERSION=10
|
||||
|
|
@ -637,6 +637,20 @@ case $SYSTEM_TYPE in
|
|||
CFLAGS="$CFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
|
||||
CXXFLAGS="$CXXFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
|
||||
;;
|
||||
*solaris2.8*)
|
||||
# Solaris 2.8 has a broken /usr/include/widec.h
|
||||
# Make a fixed copy in ./include
|
||||
echo "Fixing broken include files for $SYSTEM_TYPE"
|
||||
echo " - Creating local copy of widec.h"
|
||||
if test ! -d include
|
||||
then
|
||||
mkdir ./include
|
||||
fi
|
||||
builddir=`pwd`
|
||||
sed -e "s|^#if[ ]*!defined(__lint)|#if !defined\(__lint\) \&\& !defined\(getwc\)|" < /usr/include/widec.h > include/widec.h
|
||||
CFLAGS="$CFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
|
||||
CXXFLAGS="$CXXFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
|
||||
;;
|
||||
*solaris2.5.1*)
|
||||
echo "Enabling getpass() workaround for Solaris 2.5.1"
|
||||
CFLAGS="$CFLAGS -DHAVE_BROKEN_GETPASS -DSOLARIS -DHAVE_RWLOCK_T";
|
||||
|
|
@ -1514,7 +1528,7 @@ AC_ARG_WITH(bench,
|
|||
|
||||
if test "$with_bench" = "yes"
|
||||
then
|
||||
bench_dirs="sql-bench"
|
||||
bench_dirs="sql-bench mysql-test"
|
||||
else
|
||||
bench_dirs=""
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue