into  mysql.com:/usr/home/bar/mysql-5.1-rpl


client/mysqldump.c:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/mysqldump.result:
  Empty merge of a backport patch

into  mysql.com:/usr/home/bar/mysql-5.0.b13926


sql/item_timefunc.cc:
  Auto merged
client/mysqldump.c:
  Empty merge of "backport of bug#13926 from 5.0 to 4.1"
mysql-test/r/mysqldump.result:
  Empty merge of "backport of bug#13926 from 5.0 to 4.1"
mysql-test/t/mysqldump.test:
  Empty merge of "backport of bug#13926 from 5.0 to 4.1"

Moving tests to 4.1 section

Moving tests into their new place into 4.1 tests section

Backporting from 5.0


mysql-test/r/mysqldump.result:
  Adding test case
mysql-test/t/mysqldump.test:
  Adding test case

into  mysql.com:/usr/home/bar/mysql-4.1-rpl


sql/item_timefunc.cc:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-5.1.b22646


mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  After merge fix

into  mysql.com:/usr/home/bar/mysql-5.0.b22646


mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/r/ctype_utf8.result:
  After merge fix
sql/item_timefunc.cc:
  After merge fix

into  mysql.com:/usr/home/bar/mysql-5.0.b23619

into  mysql.com:/usr/home/bar/mysql-5.1.b23619


sql/log_event.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
mysql-test/r/binlog_stm_ctype_ucs.result:
  Use local

into  mysql.com:/usr/home/bar/mysql-5.0.b23619


sql/log_event.cc:
  Auto merged

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge

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

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge

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

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

into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl

into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0

mending windows test.


mysql-test/r/rpl_packet.result:
  results changed
mysql-test/t/rpl_packet.test:
  removing because of the connection with windows client can be lost instead of
  the error code back (source: manual).

into  kahlann.erinye.com:/home/df/mysql/build/51


scripts/make_binary_distribution.sh:
  Auto merged

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


scripts/make_binary_distribution.sh:
  SCCS merged

into  kahlann.erinye.com:/home/df/mysql/build/51


mysql-test/Makefile.am:
  Auto merged

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


mysql-test/Makefile.am:
  Auto merged

mysql-test/Makefile.am:
  add include/*.test to dist-hook and install-data-local targets to include the three .test files in mysql-test/include with make dist

into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50_1


sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged

ver 5.0 and 5.1 refinement.
adding to the MAX_SIZE_LOG_EVENT_STATUS estimation status vars and 
EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN


sql/log_event.cc:
  assertion on size of status vars
sql/log_event.h:
  MAX_SIZE_LOG_EVENT_STATUS as the max bytes of contribution of status vars into repl
  message; MAX_SIZE_LOG_EVENT_STATUS is getting more wrt to 4.1 version.

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/slave.cc:
  Manual merge

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


BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/log_event.h:
  Manual merge
sql/slave.cc:
  Manual merge

into  romeo.(none):/home/bk/b18581-mysql-5.1-new-rpl


sql/ha_ndbcluster_binlog.cc:
  Auto merged

sql/ha_ndbcluster_binlog.cc:
  Removing extreneous setting of current_stmt_binlog_row_based.
sql/rpl_injector.cc:
  Since current_stmt_binlog_row_based is reset as the end of a transaction
  it needs to be set at the beginning of a transaction.

  Raise version number after cloning 5.1.13


configure.in:
  Raise version number after cloning 5.1.13

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/collapsed:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

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


BitKeeper/etc/collapsed:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged

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