Commit 49e3024c authored by unknown's avatar unknown
Browse files

Merge 192.168.0.5:mysql/mysql-5.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents cadef275 4b13e338

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1253,6 +1253,7 @@ mysql-test/r/*.err 
mysql-test/r/*.log

mysql-test/r/*.out

mysql-test/r/*.reject

mysql-test/r/*.warnings

mysql-test/r/alter_table.err

mysql-test/r/archive.err

mysql-test/r/backup.log

BUILD/FINISH.sh

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ configure="./configure $base_configs $extra_configs" 


commands="\

$make -k distclean || true 

/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache autom4te.cache innobase/autom4te.cache;

/bin/rm -rf */.deps/*.P configure config.cache storage/*/configure storage/*/config.cache autom4te.cache storage/*/autom4te.cache;



path=`dirname $0`

. \"$path/autorun.sh\""

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ fi 
# (http://samba.org/ccache) is installed, use it.

# We use 'grep' and hope 'grep' will work as expected

# (returns 0 if finds lines)

if ccache -V > /dev/null 2>&1

if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" == "1"

then

  echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC"

  echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX"

BUILD/compile-pentium-gcov

+14 −5
Original line number Diff line number Diff line 
#! /bin/sh



# Need to disable ccache, or we loose the gcov-needed compiler output files.



CCACHE_GCOV_VERSION_ENABLED=0

if ccache -V > /dev/null 2>&1

then

  CCACHE_VER=`ccache -V | head -1 | sed s/"ccache version "//`

  if test "$CCACHE_VER" == "2.4-gcov"

  then

    CCACHE_GCOV_VERSION_ENABLED=1

  fi

fi

export CCACHE_GCOV_VERSION_ENABLED



path=`dirname $0`

. "$path/SETUP.sh"



# Need to disable ccache, or we loose the gcov-needed compiler output files.

CCACHE_DISABLE=1

export CCACHE_DISABLE



# GCC4 needs -fprofile-arcs -ftest-coverage on the linker command line (as well

# as on the compiler command line), and this requires setting LDFLAGS for BDB.

export LDFLAGS="-fprofile-arcs -ftest-coverage"
@@ -14,7 +23,7 @@ export LDFLAGS="-fprofile-arcs -ftest-coverage" 
# The  -fprofile-arcs and -ftest-coverage options cause GCC to instrument the

# code with profiling information used by gcov.

# the -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.

extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM -DHAVE_MUTEX_THREAD_ONLY"

extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM -DHAVE_MUTEX_THREAD_ONLY $debug_extra_flags"

extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"

extra_configs="$extra_configs $max_configs"

Docs/Makefile.am

+11 −11
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ all-local: $(TXT_FILES) 
# make sure that "make install" installs the info page, too

# automake only seems to take care of this automatically,

# if we're building the info page from texi directly.

install-data-hook:	mysql.info

install-data-hook:	$(srcdir)/mysql.info

	$(mkinstalldirs) $(DESTDIR)$(infodir)

	$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
@@ -44,23 +44,23 @@ CLEAN_FILES: $(TXT_FILES) 


GT = $(srcdir)/generate-text-files.pl



../INSTALL-SOURCE:	mysql.info $(GT)

	perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@

../INSTALL-SOURCE:	$(srcdir)/mysql.info $(GT)

	perl -w $(GT) $(srcdir)/mysql.info "installing-source" "windows-source-build" > $@



../INSTALL-WIN-SOURCE:	mysql.info $(GT)

	perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@

../INSTALL-WIN-SOURCE:	$(srcdir)/mysql.info $(GT)

	perl -w $(GT) $(srcdir)/mysql.info "windows-source-build" "post-installation" > $@



# We put the description for the binary installation here so that

# people who download source wont have to see it. It is moved up to

# the toplevel by the script that makes the binary tar files.

INSTALL-BINARY:	mysql.info $(GT)

	perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@

INSTALL-BINARY:	$(srcdir)/mysql.info $(GT)

	perl -w $(GT) $(srcdir)/mysql.info "installing-binary" "installing-source" > $@



../EXCEPTIONS-CLIENT: mysql.info $(GT)

	perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@

../EXCEPTIONS-CLIENT: $(srcdir)/mysql.info $(GT)

	perl -w $(GT) $(srcdir)/mysql.info "mysql-floss-license-exception" "function-index" > $@



../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)

	perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@

../support-files/MacOSX/ReadMe.txt:	$(srcdir)/mysql.info $(GT)

	perl -w $(GT) $(srcdir)/mysql.info "mac-os-x-installation" "netware-installation" > $@



# Include the Windows manual.chm in source .tar.gz only if available.

# It is not in BitKeeper, but is downloaded from intranet by Bootstrap.