Commit bfdc1b24 authored by mwagner@evoq.home.mwagner.org's avatar mwagner@evoq.home.mwagner.org
Browse files

Merge work:/home/bk/mysql 

into evoq.home.mwagner.org:/home/mwagner/work/bk/mysql
parents 83ee278d 5cce198b

Build-tools/Do-compile

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ if ($opt_stage == 0) 
    log_system("$host/bin/mysqladmin --no-defaults -u root -S $mysql_unix_port -s shutdown");

  }

  system("touch $host/mysql-fix-for-glob");

  rm_all(<$host/mysql-*>);

  rm_all(<$host/mysql-3*>);

  rm_all("$host/test");

  system("mkdir $host") if (! -d $host);

  system("mkdir $host/test") if (! -d "$host/test");

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ EXTRA_DIST = INSTALL-SOURCE README \ 
SUBDIRS =		include @docs_dirs@ @readline_dir@ \

			@thread_dirs@ @sql_client_dirs@ \

			@sql_server_dirs@ scripts tests man \

			@bench_dirs@ support-files mysql-test

			@bench_dirs@ support-files



# Relink after clean

CLEANFILES =		linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

configure.in

+16 −2
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.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

scripts/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \ 
			mysql_find_rows.sh \

			mysqlhotcopy.sh \

		        mysqldumpslow.sh \

			mysqld_multi \

			mysqld_multi.sh \

			safe_mysqld.sh



EXTRA_DIST =		$(EXTRA_SCRIPTS) \

scripts/make_binary_distribution.sh

+3 −3
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ cp -r -p sql/share/* $BASE/share/mysql 
rm -f $BASE/share/mysql/Makefile* $BASE/share/mysql/*/*.OLD

rm -rf $BASE/share/SCCS  $BASE/share/*/SCCS 



cp  -p mysql-test/mysql-test-run mysql-test/install_test_db $BASE/scripts

cp -p mysql-test/README $BASE/README

cp -p mysql-test/mysql-test-run mysql-test/install_test_db $BASE/mysql-test/

cp -p mysql-test/README $BASE/mysql-test/README

cp -p mysql-test/include/*.inc $BASE/mysql-test/include

cp -p mysql-test/std_data/*.dat  mysql-test/std_data/*.frm \

      mysql-test/std_data/*.MRG  $BASE/mysql-test/std_data