Commit 25bf1eae authored by unknown's avatar unknown
Browse files

Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents ae6cc963 4f12094f

.bzrignore

+17 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,7 @@ mysql-test/mysql-test-run-shell 
mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster

mysql-test/partitions.log

mysql-test/r/*.err

mysql-test/r/*.log

mysql-test/r/*.out
@@ -1334,8 +1335,21 @@ mysql-test/r/symlink.log 
mysql-test/r/system_mysql_db.log

mysql-test/r/tmp.result

mysql-test/r/udf.log

mysql-test/rpl.log

mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings

mysql-test/suite/funcs_1/r/innodb_views.warnings

mysql-test/suite/funcs_1/r/memory_trig_03e.warnings

mysql-test/suite/funcs_1/r/memory_views.warnings

mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings

mysql-test/suite/funcs_1/r/myisam_views.warnings

mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings

mysql-test/suite/funcs_1/r/ndb_views.warnings

mysql-test/suite/partitions/r/diff

mysql-test/suite/partitions/r/partition_bit_ndb.warnings

mysql-test/suite/partitions/r/partition_special_innodb.warnings

mysql-test/suite/partitions/r/partition_special_myisam.warnings

mysql-test/t/index_merge.load

mysql-test/t/tmp.test

mysql-test/var
@@ -1644,6 +1658,7 @@ ndb/src/kernel/error/liberror.dsp 
ndb/src/kernel/ndbd

ndb/src/kernel/ndbd.dsp

ndb/src/kernel/vm/libkernel.dsp

ndb/src/libndb.ver

ndb/src/libndbclient.dsp

ndb/src/mgmapi/libmgmapi.dsp

ndb/src/mgmclient/libndbmgmclient.dsp
@@ -2080,6 +2095,7 @@ storage/archive/.deps/ha_archive_la-azio.Plo 
storage/archive/.deps/ha_archive_la-ha_archive.Plo

storage/archive/.deps/libarchive_a-azio.Po

storage/archive/.deps/libarchive_a-ha_archive.Po

storage/archive/archive_reader

storage/archive/archive_test

storage/bdb/*.ds?

storage/bdb/*.vcproj
@@ -2638,6 +2654,7 @@ storage/ndb/src/kernel/error/liberror.dsp 
storage/ndb/src/kernel/ndbd

storage/ndb/src/kernel/ndbd.dsp

storage/ndb/src/kernel/vm/libkernel.dsp

storage/ndb/src/libndb.ver

storage/ndb/src/libndbclient.dsp

storage/ndb/src/mgmapi/libmgmapi.dsp

storage/ndb/src/mgmclient/libndbmgmclient.dsp

BUILD/SETUP.sh

+19 −1
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ if [ "x$warning_mode" != "xpedantic" ]; then 
  warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W"

  warnings="$warnings -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare"

  warnings="$warnings -Wwrite-strings -Wunused-function -Wunused-label -Wunused-value -Wunused-variable"



# For more warnings, uncomment the following line

# warnings="$global_warnings -Wshadow"



# C warnings

  c_warnings="$warnings -Wunused-parameter"

# C++ warnings
@@ -139,9 +143,17 @@ fi 
#

base_configs="--prefix=$prefix --enable-assembler "

base_configs="$base_configs --with-extra-charsets=complex "

base_configs="$base_configs --enable-thread-safe-client --with-readline "

base_configs="$base_configs --enable-thread-safe-client "

base_configs="$base_configs --with-big-tables"



if test -d "$path/../cmd-line-utils/readline"

then

    base_configs="$base_configs --with-readline"

elif test -d "$path/../cmd-line-utils/libedit"

then

    base_configs="$base_configs --with-libedit"

fi



static_link="--with-mysqld-ldflags=-all-static "

static_link="$static_link --with-client-ldflags=-all-static"

# we need local-infile in all binaries for rpl000001
@@ -183,6 +195,12 @@ 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 test "$USING_GCOV" != "1"

then

  # Not using gcov; Safe to use ccache

  CCACHE_GCOV_VERSION_ENABLED=1

fi



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

then

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

BUILD/SETUP.sh.rej

0 → 100644
+19 −0
Original line number Diff line number Diff line 
***************

*** 39,46 ****

  c_warnings="$global_warnings -Wunused"

  cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

  

! alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet

! pentium_cflags="-mcpu=pentiumpro"

  sparc_cflags=""

  

  # be as fast as we can be without losing our ability to backtrace

--- 39,46 ----

  c_warnings="$global_warnings -Wunused"

  cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

  

! #alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# Not used yet

! #pentium_cflags="-mcpu=pentiumpro"

  sparc_cflags=""

  

  # be as fast as we can be without losing our ability to backtrace

BUILD/compile-pentium-gcov

+4 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


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



USING_GCOV=1

CCACHE_GCOV_VERSION_ENABLED=0

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

then
@@ -26,8 +27,10 @@ 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 $debug_extra_flags"

extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM -DHAVE_MUTEX_THREAD_ONLY $debug_extra_flags $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov"

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

extra_configs="$extra_configs $max_configs"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"



. "$path/FINISH.sh"

BitKeeper/etc/collapsed

+10 −0
Original line number Diff line number Diff line
@@ -33,4 +33,14 @@ 
4561bde4qWhz1I8tkItXKex5uniipA

4562ba016dYH0JzszOqZ8p6psbKfnQ

45771031yRCoM_ZfONdYchPvVEgLRg

459a60d8rIxeTuhB3j_QsOwLGdcpng

459a61c9OS8PzIsdviZJDkybJ1y1uA

459a70691aYIfU2ohV0a3P5iTLpO2A

459a7422KF_P7PuU3YQ5qG6ZLEVpiA

459a74e4nRcXppMSBYeQQ5efDkTADg

45ae6628gqKTsUFfnoNExadETVIkbA

45ba4faf2oqu6eR8fqecR3LfSNcYUg

45ba5238-NKl80QVXzdGo8hO9M75Xg

45c0fdfb2mz6NdOIsLenJtf6_ZelTA

45d1ffcd-r3v8A7uh92hQaMfQM9UPQ

45d21437Vg_-i4uOWyvzYWHESXDP6A