Corrected master server id's


mysql-test/mysql-test-run.pl:
  Corrected master server id's

  Corrected path to CA certificate


mysql-test/mysql-test-run.sh:
  Corrected path to CA certificate

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

  remaining bugs in the Perl version have been resolved


Makefile.am:
  - reverted to using the shell version of mysql-test-run until the remaining bugs
    in the Perl version have been resolved

Fix for compilation failure with Forte Developer C++.


configure.in:
  Export ARFLAGS, so innobase could pick it up.
innobase/configure.in:
  Use ARFLAGS exported by parent configure script.

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


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

  Might need a restart after test with special TZ
  Removed unused argument to run_mysqltest()


mysql-test/mysql-test-run.pl:
  Might need a restart after test with special TZ
  Removed unused argument to run_mysqltest()

Fix for "multiple definition of __cxa_pure_virtual" link failure
when compiling with icc.


extra/yassl/taocrypt/include/runtime.hpp:
  Do not define __cxa_pure_virtual for ICC.
  Fixes "multiple definition of __cxa_pure_virtual" link failure on production.

into mysql.com:/space/my/mysql-5.0.8-clone

BitKeeper/deleted/.del-generate-flag-images~f77476753fff8186:
  Delete: Docs/Support/generate-flag-images
Docs/Makefile.am:
  - fixed node names for the new info file
Docs/Support/generate-text-files.pl:
  - stop printing if the index was reached

into mdk10.(none):/home/reggie/bk/mysql-5.0-base


mysys/my_access.c:
  Auto merged

into moonbone.local:/work/mysql-5.0-merge

  Fix for bugfix #9728 merge


sql/sql_base.cc:
  Fix for bugfix #9728 merge
mysql-test/t/insert_update.test:
  Fix for bugfix #9728 merge
mysql-test/r/insert_update.result:
  Fix for bugfix #9728 merge

mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_base.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
sql/sql_yacc.yy:
  Manual merge

into radha.local:/Volumes/disk2s1/mysql-5.0

sql/sql_class.cc:
  Statement constructor for the case when it's used for backup only
  was removed.
sql/sql_class.h:
  Remove THD::stmt_backup and simplify Statement constructors.
sql/sql_prepare.cc:
  Use an object on stack instead of THD::stmt_backup
sql/sql_select.cc:
  Use an object on stack instead of THD::stmt_backup

into mdk10.(none):/home/reggie/bk/bug9148

into moonbone.local:/work/mysql-4.1-bug-8147

  Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
  Have to return false to set flag for whole expression.


sql/item.h:
  Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
  Have to return false to set flag for whole expression.

into radha.local:/Volumes/disk2s1/mysql-5.0

sql/ha_federated.cc:
  Added auto-reconnect to allow foreign server restarts.

  Add a slave when running the federated test case


mysql-test/lib/mtr_cases.pl:
  Add a slave when running the federated test case

into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0


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

into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0


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

  Bug#11481, set charset directory to mysqlbinlog


mysql-test/mysql-test-run.pl:
  Bug#11481, set charset directory to mysqlbinlog

into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_parse.cc:
  SCCS merged

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


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

into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0

into mysql.com:/home/psergey/mysql-5.0-bug8441

into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0


sql/sql_parse.cc:
  Manual merge

mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-bug8441

into mysql.com:/mnt/archive/svoj/mysql/mysql-5.0

configure.in:
  Move AR guessing to misc.m4.

into hundin.mysql.fi:/home/marko/mysql-5.0-current

into mysql.com:/opt/local/work/mysql-5.0-10736-new


sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into mysql.com:/space/my/mysql-4.1

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

configure.in:
  Post-review fix: better comment.