into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl:
  late after-merge fix: re-add MTR_BUILD_THREAD=auto

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/lib/mtr_process.pl:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/lib/mtr_process.pl:
  Auto merged

mysql-test/lib/mtr_process.pl:
  print extra message _once_ every 60 seconds

into  trift2.:/MySQL/M51/bug24182-5.1

support-files/mysql.spec.sh:
  Call "make install" using "benchdir_root=%{_datadir}", because that is affecting 
  the regression test suite as well.    Fixes bug#24182.

into  trift2.:/MySQL/M51/push-5.1

into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-5.0-build


Makefile.am:
  SCCS merged

  Remove soft links before creating source TAR, to avoid file copies (bug#11865)


Makefile.am:
  Remove soft links before creating source TAR, to avoid file copies (bug#11865)

into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged

  Corrected change to create "win" directory


Makefile.am:
  Corrected change to create "win" directory

into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged

  "make distcheck" fix, "win" directory


Makefile.am:
  "make distcheck" fix, "win" directory

into  trift2.:/MySQL/M51/push-5.1


sql-common/my_time.c:
  Auto merged

  Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries


config/ac-macros/ssl.m4:
  Use libtool way of specifying yaSSL libraries
libmysqld/Makefile.am:
  Adjusted path to yaSSL libtool libraries
storage/ndb/config/type_kernel.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapi.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitest.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitools.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_util.mk.am:
  Changed paths to ndb include directory to include "storage"

into  mysql.com:/home/kent/bk/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-5.1-build


sql-common/my_time.c:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-5.0-build

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1


sql-common/my_time.c:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl:
  remove dependency on Data::Dumper, it's not used anywhere

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


sql/sql_parse.cc:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build

into  trift2.:/MySQL/M51/push-5.1

into  mysql.com:/home/kent/bk/mysql-5.1-build


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged

into  bodhi.local:/opt/local/work/mysql-5.1-24486


sql/sql_parse.cc:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-merge


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  SCCS merged

deadlock_innodb:events_grant". This was a memory leak introduced by 
the patch for Bug 22830.
Post-review fixes.


sql/sql_parse.cc:
  A fix for Bug#24486 "Valgrind warnings: sp_head(),
   deadlock_innodb:events_grant": delete the sphead object before
  returning with an error.

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M50/push-5.0

netware/BUILD/nwbootstrap:
  Editing "mwenv" is now obsolete,
  as this file gets its variable settings from the environment already;
  and it is even plain wrong,
  because the assignments to those variables are written in such a way that
  replacing the variables by values (as tried here) yields invalid shell lines.

into  mysql.com:/home/kent/bk/mysql-5.1-build


client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-5.0-build