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 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:/home/svoj/devel/mysql/yassl-mysql-5.0

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

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


sql/sp_head.cc:
  Auto merged

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

innobase/row/row0ins.c:
  Remove compilation warnings and errors on SGI IRIX.

innobase/btr/btr0cur.c:
  Replace for loop with memset()
innobase/buf/buf0buf.c:
  buf_print(): Remove for loop for initializing counts[].
  Similar to index_ids[], the elements of this array will
  be initialized when they are allocated, i.e., counts[n_found++] = 1.
innobase/os/os0file.c:
  Replace for loop with memset()
innobase/page/page0page.c:
  Replace for loop with memset()
innobase/trx/trx0rec.c:
  Replace for loop with memset()

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

ndb/src/common/util/version.c:
  Maybe upgrade compatibility in 4.1 range to latest build version

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


sql/item.cc:
  Auto merged
sql/item_buff.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

Fix GCC 4.0 link failure.
Better CXX_VERSION guessing.


config/ac-macros/misc.m4:
  Better CXX_VERSION guessing.
configure.in:
  CXX_VERSION guessing moved to misc.m4.
  HAVE_EXPLICIT_TEMPLATE_INSTANTIATION moved to config.h.
  Use compiler AR with MIPSpro and Forte instead of instantiating templates explicitly.
extra/yassl/src/crypto_wrapper.cpp:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
extra/yassl/src/template_instnt.cpp:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
extra/yassl/src/yassl_int.cpp:
  GCC 4.0 link fix. This file needs __cxa_pure_virtual.
extra/yassl/taocrypt/include/runtime.hpp:
  Fix GCC 4.0 link failure. Instruct compiler to always emit __cxa_pure_virtual even if
  it seems to be never used.
extra/yassl/taocrypt/include/types.hpp:
  Include config.h.
extra/yassl/taocrypt/src/algebra.cpp:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
extra/yassl/taocrypt/src/dh.cpp:
  GCC 4.0 link fix. This file needs __cxa_pure_virtual.
extra/yassl/taocrypt/src/dsa.cpp:
  GCC 4.0 link fix. This file needs __cxa_pure_virtual.
extra/yassl/taocrypt/src/integer.cpp:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
extra/yassl/taocrypt/src/rsa.cpp:
  GCC 4.0 link fix. This file needs __cxa_pure_virtual.
extra/yassl/taocrypt/src/template_instnt.cpp:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/field.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/item.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/item_buff.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/mysqld.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/opt_range.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/set_var.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/slave.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/sql_acl.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/sql_class.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/sql_insert.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/sql_map.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/sql_select.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/sql_show.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
sql/table.cc:
  EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.

innobase/include/rem0rec.h:
  rec_get_nth_field(): Correct the comment.
innobase/include/rem0rec.ic:
  rec_get_nth_field(): Correct the comment.

into mysql.com:/home/cps/mysql/trees/mysql-5.0

main_mem_root is moved out of class Query_arena.


sql/sp_head.cc:
  Adjust to the changed Query_arena constructor. 
  main_mem_root is moved out of class Query_arena.
sql/sp_head.h:
  main_mem_root is moved out of class Query_arena: add it to class sp_head.
sql/sql_class.cc:
  main_mem_root is moved out of class Query_arena: remove
  constructors no longer relevant, remove dead code.
sql/sql_class.h:
  main_mem_root is moved out of class Query_arena.
sql/sql_prepare.cc:
  It's better to not use main_mem_root anywhere: logically, it's not
  a public member (can't fix sp_head::make_field and Item_subselect::exec
  to make it protected)
sql/sql_select.cc:
  New Cursor constructor, which avoids unneeded memory allocation
  when initializign main_mem_root.
sql/sql_select.h:
  main_mem_root is moved out of class Query_arena.