into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  solace.(none):/home/mtaylor/src/mysql-5.1-build


BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


scripts/make_binary_distribution.sh:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build

cause sporadic, but benign, errors.


mysql-test/lib/mtr_report.pl:
  Filtering out sporadic but benign error in rpl_err_ignoredtable.

into  pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239


storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged

ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Move the increment to next line to avoid icc optimization problem that
  caused the "b" reference to be incremented

mysql-test/lib/mtr_report.pl:
  Ignoring benign error message (killing query causes unpredictable
  error messages).
mysql-test/suite/binlog/t/binlog_old_versions.test:
  Disabling test case for embedded server.
sql/rpl_rli.cc:
  Inititializing uninitialized variable causing valgrind warning.

mysql-test/suite/rpl/r/rpl_user.result:
  Result change.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/r/rpl_user.result:
  Manual merge.

mysql-test/r/rpl_user.result:
  Result change.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/t/rpl_user.test:
  Manual merging.

mysql-test/t/rpl_user.test:
  Removing redundant reset master and deleting users from master
  and slave without using binary log.

mysql-test/suite/rpl/r/rpl_row_trig001.result:
  Result change.
mysql-test/suite/rpl/t/rpl_row_trig001.test:
  Correcting a typo and trying to avoid a race condition when
  dumping the contents of the master and slave for comparison.

mysql-test/suite/rpl/t/rpl_idempotency.test:
  Adding "have_innodb.inc" since the test reqires InnoDB.

mysql-test/include/delete_anonymous_users.inc:
  Disabling warnings.
mysql-test/lib/mtr_report.pl:
  Masking out benign errors and warnings from var/log/warnings file.

mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt:
  Correcting read_buffer_size to be a multiple of 4KiB since a
  warning is generated otherwise.

mysql-test/lib/mtr_report.pl:
  Removing some expected warnings and errors from the slave for
  tests rpl_idempotency and rpl_skip_error.

           exists t1,t2,t3'
Bug #34245 Test ndb_binlog_multi fails for 'CREATE TABLE'
Bug #34246 Test rpl_ndb_transaction fails with 'Failed to create
           'mysql/ndb_apply_status'

Tests cases didn't wait for cluster to come up due to a typo
in have_multi_ndb.inc.


mysql-test/include/have_multi_ndb.inc:
  SHOW TABLES is case-sensitive in the pattern to LIKE.
mysql-test/suite/ndb/t/disabled.def:
  Enabling tests.
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Adding include of have_debug since test requires that.
sql/sql_repl.cc:
  Replacing 'return' with 'DBUG_RETURN' in debug-traced function.

mysql-test/suite/ndb/t/disabled.def:
  Disabling tests ndb_binlog_lob_bin, ndb_binlog_multi,
  and rpl_ndb_transaction.
mysql-test/suite/parts/t/disabled.def:
  Disabling various partition tests.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


client/mysqlbinlog.cc:
  Auto merged

mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Result change.
mysql-test/suite/binlog/t/binlog_start_comment.test:
  Removing --short-form since that cause test to fail.

into  mysql_cab_desk.:D:/source/c++/mysql-5.0-rpl-merge

This patch adds code to convert the path for LOAD DATA INFILE 
events to a Unix path which is needed for running mysql client
on Windows. 


client/mysqlbinlog.cc:
  BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
  
  This patch adds code to convert the path for LOAD DATA INFILE 
  events to a Unix path which is needed for running mysql client
  on Windows. 
  
  The 'd:\x\y\z' path becomes 'd:xyz' when run in the client.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  SCCS merged

on the context.


mysql-test/r/mysqlbinlog.result:
  Result file change.
mysql-test/t/mysqlbinlog.test:
  Blanking out yet some numbers in file names.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


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

mysql-test/r/mysqlbinlog.result:
  Result file change.
mysql-test/t/mysqlbinlog.test:
  Fixing test to not be dependent on the sequence numbers
  for file names generated by mysqlbinlog.

mysql-test/suite/binlog/t/binlog_old_versions.test:
  MYSQL_BINLOG was missing --local-load option.
  MYSQL was missing --local-infile=1 option.

are propagated from earlier versions.


BitKeeper/deleted/.del-binlog_start_comment.result:
  Delete: mysql-test/suite/binlog/r/binlog_start_comment.result
mysql-test/suite/binlog/r/binlog_start_comment.result:
  Rename: mysql-test/suite/r/binlog_start_comment.result -> mysql-test/suite/binlog/r/binlog_start_comment.result
BitKeeper/deleted/.del-binlog_start_comment.test:
  Delete: mysql-test/suite/binlog/t/binlog_start_comment.test
mysql-test/suite/binlog/t/binlog_start_comment.test:
  Rename: mysql-test/suite/t/binlog_start_comment.test -> mysql-test/suite/binlog/t/binlog_start_comment.test

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


BitKeeper/deleted/.del-binlog_start_comment.test:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged

mysql-test/r/mix_innodb_myisam_binlog.result:
  Result change
mysql-test/t/binlog_start_comment.test:
  Adding --local-load to mysqlbinlog to prevent it from failing
  on Windows. Also adding --short-form.
mysql-test/t/mix_innodb_myisam_binlog.test:
  Extending LIKE pattern to use either \n or \r\n in order to work
  on Windows.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


BitKeeper/deleted/.del-binlog_start_comment.test:
  Auto merged
include/my_sys.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


BitKeeper/deleted/.del-bdb_notembedded.result:
  Auto merged
BitKeeper/deleted/.del-strict_autoinc_4bdb.result:
  Auto merged