Commit 19daf5d9 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
plugin/fulltext/plugin_example.c:
  e
  C
sql/field.h:
  e
parents dd7e49e0 fe99bda8

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1252,6 +1252,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"

client/client_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -58,5 +58,6 @@ enum options_client 
  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,

  OPT_DEBUG_INFO, OPT_COLUMN_TYPES

};