Commit d29eaed8 authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
parents 43b2dc18 a70903b7

Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -157,6 +157,8 @@ test-bt: 
	@PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --force --comment=rowlock --suite=row_lock



test-bt-debug:

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

libmysql/CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake") 
# storage does not work properly in DLLs.

SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")

SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")

SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")

SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")

SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")

SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_TLS")



INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 

                    ${CMAKE_SOURCE_DIR}/zlib

scripts/make_binary_distribution.sh

+40 −32
Original line number Diff line number Diff line
@@ -102,11 +102,41 @@ case $system in 
    ;;

esac



# This is needed to prefer GNU tar over platform tar because that can't

# always handle long filenames



PATH_DIRS=`echo $PATH | \

    sed -e 's/^:/. /' -e 's/:$/ ./' -e 's/::/ . /g' -e 's/:/ /g' `



which_1 ()

{

  for cmd

  do

    for d in $PATH_DIRS

    do

      for file in $d/$cmd

      do

	if [ -x $file -a ! -d $file ] ; then

	  echo $file

	  exit 0

	fi

      done

    done

  done

  exit 1

}



tar=`which_1 gnutar gtar`

if [ "$?" = "1" -o x"$tar" = x"" ] ; then

  tar=tar

fi





mkdir $BASE $BASE/bin $BASE/docs \

 $BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/scripts \

 $BASE/mysql-test $BASE/mysql-test/t  $BASE/mysql-test/r \

 $BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/mysql-test/lib

 $BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/mysql-test/lib \

 $BASE/mysql-test/suite



if [ $BASE_SYSTEM != "netware" ] ; then

 mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \
@@ -117,8 +147,8 @@ fi 


# Copy files if they exists, warn for those that don't.

# Note that when listing files to copy, we might list the file name

# twice, once in the directory location where it is build, and a

# second time in the ".libs" location. In the case the firs one

# twice, once in the directory location where it is built, and a

# second time in the ".libs" location. In the case the first one

# is a wrapper script, the second one will overwrite it with the

# binary file.

copyfileto()
@@ -274,6 +304,13 @@ $CP mysql-test/t/*.test mysql-test/t/*.imtest \ 
$CP mysql-test/r/*.result mysql-test/r/*.require \

    $BASE/mysql-test/r



# Copy the additional suites "as is", they are in flux

$tar cf - mysql-test/suite | ( cd $BASE ; $tar xf - )

# Clean up if we did this from a bk tree

if [ -d mysql-test/SCCS ] ; then

  find $BASE/mysql-test -name SCCS -print | xargs rm -rf

fi



if [ $BASE_SYSTEM != "netware" ] ; then

  chmod a+x $BASE/bin/*

  copyfileto $BASE/bin scripts/*
@@ -374,41 +411,12 @@ if [ x$DEBUG = x1 ] ; then 
 exit

fi



# This is needed to prefere gnu tar instead of tar because tar can't

# always handle long filenames



PATH_DIRS=`echo $PATH | \

    sed -e 's/^:/. /' -e 's/:$/ ./' -e 's/::/ . /g' -e 's/:/ /g' `



which_1 ()

{

  for cmd

  do

    for d in $PATH_DIRS

    do

      for file in $d/$cmd

      do

	if [ -x $file -a ! -d $file ] ; then

	  echo $file

	  exit 0

	fi

      done

    done

  done

  exit 1

}



if [ $BASE_SYSTEM != "netware" ] ; then



  #

  # Create the result tar file

  #



  tar=`which_1 gnutar gtar`

  if [ "$?" = "1" -o x"$tar" = x"" ] ; then

    tar=tar

  fi



  echo "Using $tar to create archive"



  OPT=cvf