mysql-test/include/show_binlog_events.inc:
  Replacing file_id=N with file_id=# to avoid result mismatches
mysql-test/suite/binlog/r/binlog_killed_simulate.result:
  Result change
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Result change
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  Result change
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Result change
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  Binlog positions differ between mixed and statement based replication.
mysql-test/suite/rpl/r/rpl_stm_log.result:
  Result change

mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
  Result change
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Removing duplicate DROP TABLE causing test to fail.

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

mysql-test/suite/rpl/r/rpl_init_slave.result:
  Result change.
mysql-test/suite/rpl/t/rpl_init_slave.test:
  Starting and stopping slave to make sure that the init_slave
  variable is executed.

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


BitKeeper/deleted/.del-binlog_start_comment.result:
  Auto merged
BitKeeper/deleted/.del-binlog_start_comment.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Manual merge.

BitKeeper/deleted/.del-binlog_start_comment.test:
  Delete: mysql-test/t/binlog_start_comment.test
BitKeeper/deleted/.del-binlog_start_comment.result:
  Delete: mysql-test/r/binlog_start_comment.result
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Rename: mysql-test/t/binlog_unsafe.test -> mysql-test/suite/binlog/t/binlog_unsafe.test
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Rename: mysql-test/r/binlog_unsafe.result -> mysql-test/suite/binlog/r/binlog_unsafe.result
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Result change.
mysql-test/suite/rpl/r/rpl_timezone.result:
  Result change.
mysql-test/suite/rpl/t/rpl_row_sp005.test:
  Adding missing sync with master causing test to fail.

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


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/suite/binlog/r/binlog_row_binlog.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
  Auto merged
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
mysql-test/include/have_multi_ndb.inc:
  Manual merge.
mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
  Manual merge.
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Manual merge.

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Fixing test file to use different positions depending
  on binlog format.
mysql-test/suite/binlog/r/binlog_row_binlog.result:
  Result change.
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Result change.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Result change.
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
  Removing part of test that does not work any more.
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  Removing part of test that does not work any more.
mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
  Result change.
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Dropping tables on both master and slave, and not only on slave.

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Fixing test to use different positions depending on binlog format.
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Result change.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Result change.
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
  Removing part of test that does not work any more.
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  Removing part of test that does not work any more.

mysql-test/r/binlog_start_comment.result:
  Result change.
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Result change.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Result change.
mysql-test/suite/rpl/r/rpl_timezone.result:
  Result change.
mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
  Result change.
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Masking out columns with binlog positions from slave status.
mysql-test/t/binlog_start_comment.test:
  Added missing drop table causing subsequent tests to fail.
sql/log_event.cc:
  Changing last_err* fields to client_last_err*
sql/log_event_old.cc:
  Changing last_err* fields to client_last_err*

into  riska.(none):/home/sven/bk/b26395-autocommit-xa/5.1-new-rpl

mysql-test/include/have_multi_ndb.inc:
  check that information_schema.engines table exists

mysql-test/suite/rpl/r/rpl_create_database.result:
  updated result file
mysql-test/suite/rpl/r/rpl_load_from_master.result:
  updated result file
mysql-test/suite/rpl/t/rpl_create_database.test:
  added the mask 'mysql%' for SHOW DATABASES
mysql-test/suite/rpl/t/rpl_load_from_master.test:
  added the mask 'mysql%' for SHOw DATABASES

BitKeeper/deleted/.del-rpl_drop_view.test:
  Delete: mysql-test/t/rpl_drop_view.test
BitKeeper/deleted/.del-rpl_drop_view.result:
  Delete: mysql-test/r/rpl_drop_view.result

mysql-test/suite/rpl/t/rpl_server_id.test:
  Rename: mysql-test/t/rpl_server_id.test -> mysql-test/suite/rpl/t/rpl_server_id.test
mysql-test/suite/rpl/r/rpl_server_id.result:
  Rename: mysql-test/r/rpl_server_id.result -> mysql-test/suite/rpl/r/rpl_server_id.result

into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.1


sql/set_var.cc:
  Auto merged
BitKeeper/deleted/.del-rpl_slave_skip.result:
  Auto merged
BitKeeper/deleted/.del-rpl_slave_skip.test:
  Auto merged
sql/slave.cc:
  Manual merged

BitKeeper/deleted/.del-rpl_transaction.result:
  Delete: mysql-test/r/rpl_transaction.result
BitKeeper/deleted/.del-rpl_transaction-master.opt:
  Delete: mysql-test/t/rpl_transaction-master.opt
BitKeeper/deleted/.del-rpl_transaction-slave.opt:
  Delete: mysql-test/t/rpl_transaction-slave.opt
BitKeeper/deleted/.del-rpl_transaction.test:
  Delete: mysql-test/t/rpl_transaction.test

into  riska.(none):/home/sven/bk/b26395-autocommit-xa/5.1-new-rpl
Should really not be merged, will undo later


sql/log_event.cc:
  Auto merged
BitKeeper/deleted/.del-sp_trans_log.result:
  Auto merged
mysql-test/r/multi_update.result:
  bad auto merge, will undo later
mysql-test/r/variables-big.result:
  bad auto merge, will undo later
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  bad auto merge, will undo later
sql/log.cc:
  bad auto merge, will undo later

Now, every transaction (including autocommit transactions) start with
a BEGIN and end with a COMMIT/ROLLBACK in the binlog.
Added a test case, and updated lots of test case result files.


mysql-test/t/rpl_transaction-master.opt:
  BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction-master.opt
mysql-test/t/rpl_transaction-slave.opt:
  BitKeeper file /home/sven/bk/b26395-autocommit-xa/5.0-rpl/mysql-test/t/rpl_transaction-slave.opt
mysql-test/r/mix_innodb_myisam_binlog.result:
  Updated result file
mysql-test/r/multi_update.result:
  Updated result file
mysql-test/r/rpl_transaction.result:
  New result file for new test case.
mysql-test/r/sp_trans_log.result:
  Updated result file
mysql-test/r/variables-big.result:
  Updated result file
mysql-test/t/rpl_transaction.test:
  New test case.
sql/log.cc:
   - Always write BEGIN and COMMIT around statements, even in autocommit
     mode.
   - Added comments for binlog_commit and binlog_rollback.
sql/log_event.cc:
  Added debug trigger to avoid writing xid events to the binlog.

into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#28908/5.0

into  capulet.kindahl.net:/home/mats/devel/fix-mysql-5.0-rpl

When set the server-id dynamically, the server_id member of current thread is not updated.

Update the server_id member of current thread after updated the global variable value.


sql/set_var.cc:
  Update server_id of current thread
mysql-test/r/rpl_server_id.result:
  Add test for BUG#28908
mysql-test/t/rpl_server_id.test:
  Add test for BUG#28908

into  riska.(none):/home/sven/bkroot/5.1-new-rpl

mysql-test/suite/binlog/r/binlog_row_binlog.result:
  updated result file.
  This part of the test was created in parallel with the fix to bug#26395,
  which modifies the output of mysqlbinlog and hence the output of many
  tests, including this one.
mysql-test/suite/rpl_ndb/r/rpl_ndb_transaction.result:
  updated result file
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  1. replaced include/show_slave_status.inc by more specific tests for the
  SQL error and IO error, as well as Slave_IO_State.
  2. drop all tables at the end of test.

mysql-test/include/have_innodb.inc:
  added new value 'ENABLED' for 'support' field

Complementary patch since LOAD DATA INFILE was not covered in
the previous patch.

This patch adds a check so that the slave skip counter is not
decreased to zero if seeing a BEGIN_LOAD_QUERY_EVENT,
APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT since these cannot
end a group. The group is terminated by an EXECUTE_LOAD_QUERY_
EVENT or DELETE_FILE_EVENT.


mysql-test/r/rpl_slave_skip.result:
  Result change.
mysql-test/t/rpl_slave_skip.test:
  Adding tests to test that the first event of a LOAD DATA INFILE
  can be skipped safely for both transactional and non-transactional
  tables. Also include a case that will generate a DELETE_FILE event
  last in the group, and this should be properly skipped as well.
sql/slave.cc:
  Not decrementing slave skip counter to zero when seeing a
  BEGIN_LOAD_QUERY_EVENT, APPEND_BLOCK_EVENT, or CREATE_FILE_EVENT
  since these cannot end a group.

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


sql/sql_string.cc:
  Auto merged

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


mysql-test/include/have_multi_ndb.inc:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
  Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_binlog.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_string.cc:
  Auto merged
mysql-test/Makefile.am:
  SCCS merged
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/suite/binlog/t/disabled.def:
  Manual merge.
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Manual merge.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Manual merge.
sql/log_event.cc:
  Manual merge.
  ,

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


sql/sql_string.cc:
  Auto merged

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


mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/user_var-binlog.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_stm_charset.result:
  Auto merged
sql/log_event.cc:
  Auto merged

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


BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/user_var-binlog.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_stm_charset.result:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Manual merge, using remove version of test.
mysql-test/suite/rpl/r/rpl_timezone.result:
  Manual merge.
sql/log_event.cc:
  Manual merge

mysql-test/include/have_multi_ndb.inc:
  added new value 'ENABLED' for support column of information_schema.engines

into  hezx.(none):/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.1-new-rpl


mysql-test/r/mysqlbinlog2.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
  Auto merged
sql/log_event.cc:
  Auto merged

fine

The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
output with a delimeter appended right after it, if the query string ends with a '--'
comment, then the delimeter would be considered as part of the comment, if there are any
statements after this query, then it will cause a syntax error.

Start a newline before appending delimiter after a query string


mysql-test/r/mysqlbinlog.result:
  Update result for BUG#32205
mysql-test/r/mysqlbinlog2.result:
  Update result for BUG#32205
mysql-test/r/user_var-binlog.result:
  Update result for BUG#32205
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
  Update result for BUG#32205
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Update result for BUG#32205
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
  fix test for BUG#32205
mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
  Update result for BUG#32205
mysql-test/suite/rpl/r/rpl_stm_charset.result:
  Update result for BUG#32205
sql/log_event.cc:
  Start a newline before appending delimiter after a query string
mysql-test/suite/binlog/r/binlog_start_comment.result:
  Add test for BUG#32205
mysql-test/suite/binlog/t/binlog_start_comment.test:
  Add test for BUG#32205

rpl_ndb tests on sapsrv1.


sql/ha_ndbcluster_binlog.cc:
  Try to fix assertion failures at slave shutdown when running
  rpl_ndb tests. If the binlog thread is killed, which happens during
  shutdown, open_tables returns error without setting an error
  in THD. Therefore one can't access thd->main_da.message() if thd->killed.

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

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

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
output with a delimeter appended right after it, if the query string ends with a '--'
comment, then the delimeter would be considered as part of the comment, if there are any
statements after this query, then it will cause a syntax error.

Start a newline before appending delimiter after a query string


mysql-test/r/ctype_ucs_binlog.result:
  Update test result for BUG#32205
mysql-test/r/mix_innodb_myisam_binlog.result:
  Update test result for BUG#32205
mysql-test/r/mysqlbinlog.result:
  Update test result for BUG#32205
mysql-test/r/rpl_charset.result:
  Update test result for BUG#32205
mysql-test/r/rpl_timezone.result:
  Update test result for BUG#32205
mysql-test/r/user_var-binlog.result:
  Update test result for BUG#32205
mysql-test/t/mix_innodb_myisam_binlog.test:
  Fixed for BUG#32205
sql/log_event.cc:
  Start a newline before appending delimiter after a query string
mysql-test/r/binlog_start_comment.result:
  Add test for BUG#32205
mysql-test/t/binlog_start_comment.test:
  Add test for BUG#32205