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)

  Corrected change to create "win" directory


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

  "make distcheck" fix, "win" directory


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

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

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.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  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.0-build

  Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.


sql/Makefile.am:
  Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.

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


Docs/Makefile.am:
  Auto merged

  If using \$(srcdir)/mysql.info in action, use same in rule.


Docs/Makefile.am:
  If using \$(srcdir)/mysql.info in action, use same in rule.

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


extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged

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

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


sql-common/my_time.c:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-4.1-merge

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

  Reenabled build outside source tree


config/ac-macros/ha_berkeley.m4:
  Reenabled build outside source tree
config/ac-macros/ha_innodb.m4:
  Reenabled build outside source tree
config/ac-macros/ha_ndbcluster.m4:
  Reenabled build outside source tree
extra/yassl/src/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/benchmark/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/src/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/test/Makefile.am:
  Reenabled build outside source tree
extra/yassl/testsuite/Makefile.am:
  Reenabled build outside source tree
libmysql/Makefile.shared:
  Reenabled build outside source tree
ndb/src/mgmsrv/Makefile.am:
  Reenabled build outside source tree

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


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

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

  BSD compatibility


Docs/Makefile.am:
  BSD compatibility

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


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
bdb/dist/gen_rec.awk:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
ndb/config/type_ndbapitools.mk.am:
  Auto merged
ndb/src/kernel/Makefile.am:
  Auto merged

  Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree


bdb/dist/gen_rec.awk:
  Fix undefined behaviour.
acinclude.m4:
  Reenabled build outside ource tree
configure.in:
  Reenabled build outside ource tree
libmysql_r/Makefile.am:
  Reenabled build outside ource tree
libmysqld/Makefile.am:
  Reenabled build outside ource tree
ndb/config/common.mk.am:
  Reenabled build outside ource tree
ndb/config/type_kernel.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapi.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitest.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitools.mk.am:
  Reenabled build outside ource tree
ndb/config/type_util.mk.am:
  Reenabled build outside ource tree
ndb/src/kernel/Makefile.am:
  Reenabled build outside ource tree

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


libmysql/libmysql.c:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  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/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
strings/decimal.c:
  Auto merged

  Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".
mtr_report.pl:
  Don't try output "skipped" comment if there is none (bug#24471)


mysql-test/mysql-test-run.pl:
  Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".
mysql-test/lib/mtr_report.pl:
  Don't try output "skipped" comment if there is none (bug#24471)

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

mysql-test/lib/mtr_unique.pl:
  - add info message to mtr_require_unique_id_and_wait as suggested
  - fix for security issue
  - locks for pids of processes that don't exist anymore are reused, if ps is present and working as expected

into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-release

  Adjuster project files to reflect move of "mySTL" directory


extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Adjuster project files to reflect move of "mySTL" directory
extra/yassl/taocrypt/taocrypt.dsp:
  Adjuster project files to reflect move of "mySTL" directory
extra/yassl/taocrypt/taocrypt.vcproj:
  Adjuster project files to reflect move of "mySTL" directory
extra/yassl/taocrypt/test.dsp:
  Adjuster project files to reflect move of "mySTL" directory
extra/yassl/testsuite/testsuite.dsp:
  Adjuster project files to reflect move of "mySTL" directory
extra/yassl/yassl.dsp:
  Adjuster project files to reflect move of "mySTL" directory
extra/yassl/yassl.vcproj:
  Adjuster project files to reflect move of "mySTL" directory

Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
Added connect timeout to test to make im_daemon_life_cycle more predictable


mysql-test/mysql-test-run.pl:
  Added option --mtr-build-thread
  Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
mysql-test/t/wait_for_socket.sh:
  Added connect timeout (to make test predictable)

Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()


client/mysqldump.c:
  Added some missing DBUG_RETURN
include/errmsg.h:
  Extended error messages when loosing connection during mysql_real_connect()
libmysql/errmsg.c:
  Extended error messages when loosing connection during mysql_real_connect()
mysql-test/mysql-test-run.pl:
  Don't remove .reject files at startup
mysql-test/mysql-test-run.sh:
  Fixed that --valgrind works again
  Don't give warnings for directores in var/tmp
sql-common/client.c:
  Extended error messages when loosing connection during mysql_real_connect()

sql-common/my_time.c:
  Function declaration must be same as definition

disable filling of I_S tables for EXPLAIN


mysql-test/r/information_schema.result:
  Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash
  test case
mysql-test/t/information_schema.test:
  Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash
  test case