CMakeLists.txt:
  Fixed not matching if/endif (cmake)

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

mysql-test/t/mix_innodb_myisam_binlog.test:
  have_log_bin.inc increases transaction count by one, modify ps-protocol substitutions accordingly

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn


mysql-test/t/blackhole.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged

mysql-test/r/mix_innodb_myisam_binlog.result:
  have_log_bin.inc increases transaction count by onw
mysql-test/t/binlog.test:
  test obviously requires binlog
mysql-test/t/blackhole.test:
  test requires binlog for now
mysql-test/t/ctype_cp932_binlog.test:
  test requires binlog
mysql-test/t/ctype_cp932_notembedded.test:
  test requires binlog for now
mysql-test/t/ctype_ucs_binlog.test:
  test requires binlog
mysql-test/t/drop_temp_table.test:
  test requires binlog for now
mysql-test/t/flush_block_commit_notembedded.test:
  test requires binlog for now
mysql-test/t/insert_select-binlog.test:
  test requires binlog
mysql-test/t/mix_innodb_myisam_binlog.test:
  test requires binlog
mysql-test/t/mysqlbinlog-cp932.test:
  test requires binlog
mysql-test/t/mysqlbinlog.test:
  test requires binlog
mysql-test/t/mysqlbinlog2.test:
  test requires binlog
mysql-test/t/mysqltest.test:
  test requires binlog for now
mysql-test/t/sp_trans.test:
  test requires binlog for now
mysql-test/t/user_var-binlog.test:
  test requires binlog for now

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


configure.in:
  Auto merged

  Added --with-mysqld-libs configure flag


configure.in:
  Added --with-mysqld-libs configure flag
sql/Makefile.am:
  Added --with-mysqld-libs configure flag

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

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


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

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-17707


BUILD/check-cpu:
  Auto merged

BUILD/check-cpu:
  BUG#17707 add Turion (and Opteron)

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_func.cc:
  Auto merged
strings/strtod.c:
  Auto merged

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

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

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

Include all the additional test suites in the binary packages ("tar.gz").
This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.


scripts/make_binary_distribution.sh:
  Include all the additional test suites (for now: "funcs_1", "funcs_2", "row_lock")
  in the binary packages ("tar.gz").
  Take them "as is", without any file filtering (except for the BK subdirectories "SCCS").
  
  This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
  
  Use this opportunity to correct the language in some comments.

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50


configure.in:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

 - The SQL commands used by mysql_upgrade are written to be run
    with sql_mode set to '' - thus the scripts should change sql_mode
    for the session to make sure the SQL is legal.


mysql-test/r/mysql_upgrade.result:
  Update test result
mysql-test/t/mysql_upgrade.test:
  The SQL commands used by mysql_upgrade are written to be run
  with sql_mode set to '' - thus the scripts should change sql_mode
  for the session to make sure the SQL is legal.
scripts/mysql_system_tables_fix.sql:
  Set sql_mode to '' before running the SQL commands
  to fix system tables - backport from 5.1

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged

mysql-test/r/sp_trans.result:
  added cleanup
mysql-test/r/strict.result:
  added cleanup
mysql-test/t/sp_trans.test:
  added cleanup
mysql-test/t/strict.test:
  added cleanup

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged

into  mysql.com:/d2/hf/mrg/mysql-4.1-opt