into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
mysys/charset.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


sql/sql_acl.cc:
  Auto merged

mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Restoring old test code, but masking out offending columns
mysql-test/r/rpl_deadlock_innodb.result:
  Result change

into  kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl

mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Using include/show_slave_status.inc to get correct masking of columns.
mysql-test/r/rpl_deadlock_innodb.result:
  result change

into  kindahl-laptop.dnsalias.net:/home/bk/b29030-mysql-5.0-rpl

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl

should be fixed).

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/t/ndb_index_ordered.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/t/greedy_optimizer.test:
  Manual merge.
mysql-test/t/join.test:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

and replicated):

A DROP USER statement with a non-existing user was correctly written to
the binary log (there might be users that were removed, but not all),
but the error code was not set, which caused the slave to stop with an
error.

The error reporting code was moved to before the statement was logged
to ensure that the error information for the thread was correctly set
up. This works since my_error() will set the fields net.last_errno and
net.last_error for the thread that is reporting the error, and this
will then be picked up when the Query_log_event is created and written
to the binary log.


sql/sql_acl.cc:
  Moving error reporting code to ensure that thd->net.last_err{or,no} is
  set and adding debug printout.
mysql-test/r/rpl_grant.result:
  New BitKeeper file ``mysql-test/r/rpl_grant.result''
mysql-test/t/rpl_grant.test:
  New BitKeeper file ``mysql-test/t/rpl_grant.test''

rpl_udf -- Bug#28993 rpl_udf test causes server crash and valgrind
warning in pushbuild
rpl_ndb_circular -- Bug#29233 rpl_ndb_circular fails randomly
ndb_dd_sql_features -- Bug#29102 ndb_dd_sql_features fails in
pushbuild


mysql-test/t/disabled.def:
  Disable randomly failing tests rpl_udf, rpl_ndb_circular, 
  ndb_dd_sql_features

into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl

into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug27583-merge


sql/log_event.cc:
  manual merge, use local as the patch is in 5.1

forgotten merge with 5.0. There can be some bugs waiting for this fix in 5.0 like Bug@29232


sql/log_event.cc:
  file name is changed in step with the position.

into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl

causes later tests to fail.


mysql-test/r/ndb_backup_print.result:
  Result change.
mysql-test/t/ndb_backup_print.test:
  Adding missing drop table at the end of the test.

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


sql/ha_ndbcluster_cond.h:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

mysql-test/r/binlog_multi_engine.result:
  Result change
mysql-test/t/binlog_multi_engine.test:
  Fixing test case. Keeping some bad statements in the test since I don't
  want to disable the entire test. Have marked the offending statement
  so that they can easily be found.

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster_cond.h:
  Auto merged

mysql-test/r/sp.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster_cond.h:
  Auto merged

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


configure.in:
  Auto merged

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


configure.in:
  Auto merged

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


configure.in:
  Auto merged

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

configure.in:
  Raise version number after cloning 5.0.44

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl

- get the ndb flags right, so that the behaviour is as before

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl