into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-rpl

BitKeeper/deleted/.del-events_restart_phase2.test:
  Delete: mysql-test/t/events_restart_phase2.test
BitKeeper/deleted/.del-events_restart_phase2-master.opt:
  Delete: mysql-test/t/events_restart_phase2-master.opt
BitKeeper/deleted/.del-events_restart_phase3.test:
  Delete: mysql-test/t/events_restart_phase3.test
BitKeeper/deleted/.del-events_restart_phase3-master.opt:
  Delete: mysql-test/t/events_restart_phase3-master.opt
BitKeeper/deleted/.del-events_restart_phase2.result:
  Delete: mysql-test/r/events_restart_phase2.result
BitKeeper/deleted/.del-events_restart_phase3.result:
  Delete: mysql-test/r/events_restart_phase3.result
mysql-test/include/restart_mysqld.inc:
  New BitKeeper file ``mysql-test/include/restart_mysqld.inc''
mysql-test/include/wait_until_disconnected.inc:
  New BitKeeper file ``mysql-test/include/wait_until_disconnected.inc''
mysql-test/t/events_restart-master.opt:
  New BitKeeper file ``mysql-test/t/events_restart-master.opt''

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


mysql-test/mysql-test-run.pl:
  Auto merged

BitKeeper/deleted/.del-rpl_bug33931-slave.opt:
  Delete: mysql-test/suite/rpl/t/rpl_bug33931-slave.opt
mysql-test/include/default_mysqld.cnf:
  Set a default name for "log-bin"
mysql-test/mysql-test-run.pl:
  Check for warnings in mysqld error log files after each testcase,
  using SQL
mysql-test/lib/mtr_cases.pm:
  Make mtr_match into a perl module
mysql-test/lib/mtr_match.pm:
  Make mtr_match into a perl module
mysql-test/lib/mtr_report.pm:
  Make mtr_match into a perl module
  Print warnings if testcase failed from warnings
mysql-test/r/information_schema.result:
  Be more selective which databases and tables are select in the queries
mysql-test/r/mysql_upgrade.result:
  Update result, mysql_upgrade will check _all_ databases
mysql-test/r/mysqlcheck.result:
  Update result, mysql_upgrade should check _all_ databases
mysql-test/r/sp-destruct.result:
  Be more selective which databases and tables are select in the queries
mysql-test/r/sp-error.result:
  Backup and restore mysql.proc table
mysql-test/r/sp-security.result:
  Be more selective which databases and tables are select in the queries
mysql-test/r/sp.result:
  Be more selective which databases and tables are select in the queries
mysql-test/suite/rpl/r/rpl_bug33931.result:
  Move the setting of debug flag into the test file instead of in -slave.opt
  Add supression
mysql-test/suite/rpl/r/rpl_idempotency.result:
  Add supression
  Add master-slave-end.inc
mysql-test/suite/rpl/t/rpl_bug33931.test:
  Move the setting of debug flag into the test file instead of in -slave.opt
  Add supression
mysql-test/suite/rpl/t/rpl_idempotency.test:
  Add supression
  Add master-slave-end.inc
mysql-test/t/information_schema.test:
  Be more selective which databases and tables are select in the queries
mysql-test/t/sp-destruct.test:
  Be more selective which databases and tables are select in the queries
mysql-test/t/sp-error.test:
  Backup and restore mysql.proc table
mysql-test/t/sp-security.test:
  Be more selective which databases and tables are select in the queries
mysql-test/t/sp.test:
  Be more selective which databases and tables are select in the queries
mysql-test/include/check-warnings.test:
  New BitKeeper file ``mysql-test/include/check-warnings.test''
mysql-test/include/mtr_warnings.sql:
  New BitKeeper file ``mysql-test/include/mtr_warnings.sql''

Added waiting start/stop slave via primitives.


mysql-test/suite/rpl/r/rpl_slave_status.result:
  updated result
mysql-test/suite/rpl/t/rpl_slave_status.test:
  updated test case

mysql-test/suite/rpl/t/rpl_binlog_grant.test:
  updated test case

Fix for binlog_index test case: hide difference for paths from warning messages between Windows and Unix 


mysql-test/suite/binlog/r/binlog_index.result:
  updated result
mysql-test/suite/binlog/t/binlog_index.test:
  updated test case

into  mysql.com:/home/ksm/mysql/bugs/commit-mysql-5.1-new-rpl-bug28772


mysql-test/suite/rpl/r/rpl_row_until.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_row_until.test:
  Auto merged

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

mysql-test/r/loaddata.result:
  Update paths in result
mysql-test/r/myisam.result:
  Update paths in result
mysql-test/r/partition_not_windows.result:
  Update paths in result
mysql-test/r/symlink.result:
  Update paths in result
mysql-test/suite/binlog/r/binlog_index.result:
  Update paths in result
mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test:
  Update paths
mysql-test/suite/binlog/t/binlog_index.test:
  Update paths
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
  Fix merge error s/start-position/stop-position/
mysql-test/t/drop.test:
  Update paths
mysql-test/t/loaddata.test:
  Update paths
mysql-test/t/myisam.test:
  Update paths
mysql-test/t/partition_not_windows.test:
  Update paths
mysql-test/t/symlink.test:
  Update paths

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-rpl_row_charset.test:
  Auto merged
CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/include/commit.inc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/lib/mtr_report.pm:
  Auto merged
mysql-test/r/commit_1innodb.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_big5.result:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/partition_error.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Auto merged
mysql-test/suite/federated/federated.result:
  Auto merged
mysql-test/suite/federated/federated.test:
  Auto merged
mysql-test/suite/parts/r/partition_alter1_myisam.result:
  Auto merged
mysql-test/suite/parts/r/partition_alter2_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_log.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
  Auto merged
mysql-test/suite/rpl/t/disabled.def:
  Auto merged
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/distinct.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/partition_error.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
BitKeeper/deleted/.del-combinations:
  Delete: mysql-test/suite/binlog/combinations
mysql-test/r/partition_not_windows.result:
  Use remote
mysql-test/r/partition_symlink.result:
  Use remote
mysql-test/r/symlink.result:
  SCCS merged
mysql-test/suite/parts/inc/partition_basic.inc:
  SCCS merged
mysql-test/suite/parts/inc/partition_check_drop.inc:
  Use remote
mysql-test/suite/parts/inc/partition_layout_check1.inc:
  Use remote
mysql-test/suite/parts/inc/partition_layout_check2.inc:
  Use remote
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Use remote
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Use remote
mysql-test/suite/parts/r/partition_engine_myisam.result:
  Use remote
mysql-test/suite/parts/t/partition_sessions.test:
  SCCS merged
mysql-test/t/partition.test:
  SCCS merged
mysql-test/t/partition_not_windows.test:
  Use remote
mysql-test/t/partition_symlink.test:
  Use remote
mysql-test/t/symlink.test:
  Use remote
mysql-test/suite/binlog/r/binlog_multi_engine.result:
  Manual merge, name of binlog file changed
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
  Manual merge
mysys/my_init.c:
  Manual merge

into  mysql.com:/home/ksm/mysql/bugs/commit-mysql-5.1-new-rpl-bug30128

- avoid restart
- keep all in one file
- fix --check-testcase


BitKeeper/deleted/.del-error_simulation-master.opt:
  Delete: mysql-test/t/error_simulation-master.opt
mysql-test/r/error_simulation.result:
  Update result file
mysql-test/t/error_simulation.test:
  Dynamically set debug flag for session only

Bug#28772, added waiting Until_Log_Pos when slave starting with UNTIL clause and then waiting stop of slave. 
It helps to avoid issues when slave starts too slowly.


mysql-test/suite/rpl/r/rpl_row_until.result:
  updated result file
mysql-test/suite/rpl/t/rpl_row_until.test:
  updated test case

mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result:
  Result file change.

Bug#30128, The reason that sometimes events were executed because without STARTS clause server fires immediately after creating event and
time between create and delete event sometimes is enough for firing. So adding STARTS clause moves first execution in future after drop of event.


mysql-test/include/rpl_events.inc:
  Updated test file
mysql-test/suite/rpl/r/rpl_events.result:
  Updated result file

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


mysql-test/suite/binlog/r/binlog_base64_flag.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
  Auto merged
sql/log_event.cc:
  Auto merged

Problem: a typo in the code. When autocommit, foreign_key_checks,
sql_auto_is_null, or unique_checks changes, it prints "SET", and then a
comma-separated list of assignments. However, it does not print the
assignment to the @@autocommit variable.
Fix: print the @@autocommit variable.


mysql-test/r/mysqlbinlog.result:
  Updated result file since output of mysqlbinlog changed.
mysql-test/r/mysqlbinlog2.result:
  Updated result file since output of mysqlbinlog changed.
mysql-test/r/user_var-binlog.result:
  Updated result file since output of mysqlbinlog changed.
mysql-test/suite/binlog/r/binlog_base64_flag.result:
  Updated result file since output of mysqlbinlog changed.
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
  Updated result file since output of mysqlbinlog changed.
mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result:
  Updated result file since output of mysqlbinlog changed.
sql/log_event.cc:
  Just a typo: mysqlbinlog should print the autocommit flag
  when the value of the flag changes.
  Also fixed nearby indentation.

sql/share/errmsg.txt:
  Reverting error message to before merge.

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


mysql-test/r/binlog_index.result:
  Manual merge

mysql-test/r/binlog_index.result:
  Result set change.

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


sql/share/errmsg.txt:
  Manual merge

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

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


sql/share/errmsg.txt:
  Manual merge.

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


mysql-test/suite/rpl/r/rpl_packet.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_packet.test:
  Auto merged

mysql-test/r/rpl_packet.result:
  Result change.
mysql-test/t/rpl_packet.test:
  Setting net_buffer_length correctly for the test instead of relying on it
  being set correctly. Waiting for slave to stop after issuing a SLAVE STOP
  and waiting for slave to start when issuing a SLAVE START to prevent race
  conditions causing test failure.

into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam

into  mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl

tables is not zero any more. For row-based logging, there is an extra commit
for sending rows changed by the statement to the binary log.


mysql-test/include/commit.inc:
  For row-based logging, an extra commit is done for each statement to commit
  non-transactional changes to the binary log.
mysql-test/r/commit_1innodb.result:
  Result change.