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


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/slave.cc:
  Auto merged

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

mysql-test/r/multi_update.result:
  Result change.
mysql-test/r/rpl_bug33931.result:
  Result change.
mysql-test/suite/ndb/r/ndb_binlog_format.result:
  Result change.

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


sql/sql_delete.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
BitKeeper/deleted/.del-rpl_variables.test:
  Manual merge.
mysql-test/r/multi_update.result:
  Manual merge.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Manual merge.
sql/slave.cc:
  Manual merge.

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

t/variables.test fails on embedded server. Moved out that part again, to
a new test called t/variables-notembedded.test.


mysql-test/t/variables-notembedded.test:
  BitKeeper file /home/sven/bk/debug-max/5.1-new-rpl/mysql-test/t/variables-notembedded.test
mysql-test/r/variables-notembedded.result:
  Add -master.opt file to have a list of variables for slave_skip_errors.
mysql-test/r/variables.result:
  Variable variables not available in embedded mode to a new test,
  variables-notembedded.test
mysql-test/t/variables-notembedded-master.opt:
  Add --loose before --slave-skip-errors, so that it works if mtr is run
  with --embedded
mysql-test/t/variables.test:
  Variable variables not available in embedded mode to a new test,
  variables-notembedded.test. Result file updated accordingly.

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

Patch to remove white-space left over after removing anonymous
namespace.


sql/handler.cc:
  Removing indentation and whitespace.

Replacing a template function with a normal static function.
The template parameter, which previously was the class to
find a binlogging function in, is now passed as a pointer to
the actual binlogging function instead.

The patch requires change of indention, but that is submitted
as a separate patch.


sql/handler.cc:
  Replacing template function with a normal static function.

into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27877

failing on heavily loaded systems.


mysql-test/t/events_scheduling.test:
  Adding waits before statements since the scheduler is unpredictable
  on loaded systems and might be delayed.

into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/5.0-bug33931-assert_write_ignored_ev_when_init_slave_fails

changes for an assert and an updated results file.


mysql-test/r/mix_innodb_myisam_binlog.result:
  results file changed as there is no ROLLBACK query in binlog as it must be.
sql/sql_update.cc:
  refining assert as the initial value of transactional_tables has been
  changed to zero.

into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/5.0-bug33931-assert_write_ignored_ev_when_init_slave_fails


sql/slave.cc:
  Auto merged

mysql-test/suite/rpl/r/rpl_events.result:
  Result change.
mysql-test/suite/rpl/t/rpl_events.test:
  Replacing table with varying contents with a fresh table to avoid
  test problems. The contents of the event is unimportant for this
  part of the test.

BUG#24387, which is closed since long.


sql/mysqld.cc:
  Moving my_thread_end() to before pthread_cond_broadcast() since
  it might cause other threads to start using resources that are
  about to be released, or tries to proceed assuming that the
  resources have already been released.

This is *not* a fix to the bug. I'm only disabling the failing part of
mysqldump.test until the bug is fixed. Whoever fixes it, please re-enable
the test.


mysql-test/r/mysqldump.result:
  Disabling part of the test case until BUG#32991 is fixed. Result file
  updated accordingly.
mysql-test/t/mysqldump.test:
  Disabling this part of the test case until BUG#32991 is fixed.

and
bug#33932  assertion at handle_slave_sql if init_slave_thread() fails

the asserts were caused by 
  bug33931: having thd deleted at time of executing err: code plus
            a missed initialization;
  bug33932: initialization of slave_is_running member was missed;

fixed with relocating mi members initialization and removing delete thd
It is safe to do as deletion happens later explicitly in the caller of
init_slave_thread().

Todo: at merging the test is better to be moved into suite/bugs for 5.x (when x>0).


sql/slave.cc:
  adding the bugs simulating code;
  relocating some assignments to satisfy the asserts;
mysql-test/r/rpl_bug33931.result:
  the new result file
mysql-test/t/rpl_bug33931-slave.opt:
  option to spark the simulation code
mysql-test/t/rpl_bug33931.test:
  tests check that slave does not crash as before.
  Slave threads must be in NO running state in the end.

mysql-test/r/events_scheduling.result:
  Result change.
mysql-test/t/events_scheduling.test:
  Removing a test that only confirms that event scheduling is
  inexact, hence causing sporadic failures on loaded machines.

irrelevant to execute since the charset information does not
affect replication for row-based replication. The row-based
versions of the tests were removed, and the statement-based
version of the test was made executable by all three modes.

This involves removing any lines that causes the test to be
dependent on the contents of the binary log, and instead we
just check that the replication works as it should.


BitKeeper/deleted/.del-rpl_ndb_charset.test:
  Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test
BitKeeper/deleted/.del-rpl_ndb_charset.result:
  Delete: mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result
BitKeeper/deleted/.del-rpl_row_charset.test:
  Delete: mysql-test/extra/rpl_tests/rpl_row_charset.test
BitKeeper/deleted/.del-rpl_row_charset.test~739be9df1baaee3e:
  Delete: mysql-test/suite/rpl/t/rpl_row_charset.test
BitKeeper/deleted/.del-rpl_row_charset_innodb.test:
  Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb.test
BitKeeper/deleted/.del-rpl_row_charset_innodb-master.opt:
  Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt
BitKeeper/deleted/.del-rpl_row_charset_innodb-slave.opt:
  Delete: mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt
BitKeeper/deleted/.del-rpl_row_charset_innodb.result:
  Delete: mysql-test/suite/rpl/r/rpl_row_charset_innodb.result
BitKeeper/deleted/.del-rpl_row_charset.result:
  Delete: mysql-test/suite/rpl/r/rpl_row_charset.result
mysql-test/extra/rpl_tests/rpl_charset.test:
  Test is not dependent on binlog format any more.
  Using --echo instead of "select" to print text.
  Removing lines causing the test to be dependent on binlog contents.
mysql-test/suite/rpl/r/rpl_charset.result:
  Result change.
mysql-test/suite/rpl/t/rpl_charset.test:
  Using renamed version of test file.

tree with main.


sql/sql_binlog.cc:
  Adding code to free memory after execution of BINLOG statement.
  It caused a memory leak in the case that the execution failed
  for any reason.
sql/sql_class.cc:
  Since rli_fake is checked for NULL at various occations to mean
  that no rli_fake is assigned, NULL is assigned to rli_fake after
  deleting the instance.

mysql-test/t/variables.test, because:
 - mysql-test/suite/rpl/t/rpl_variables.test does not replicate anything,
so should not be in the rpl suite.
 - mysql-test/t/variables.test is the place for testing variable-related
problems and features.
 - I will soon commit a patch containing a test case that tests
replication of variables. It would be good if I could call the test case
mysql-test/suite/rpl/t/rpl_variables.test. I'm making place for that now.


mysql-test/t/variables-master.opt:
  Rename: mysql-test/suite/rpl/t/rpl_variables-master.opt -> mysql-test/t/variables-master.opt
BitKeeper/deleted/.del-rpl_variables.test:
  Delete: mysql-test/suite/rpl/t/rpl_variables.test
BitKeeper/deleted/.del-rpl_variables.result:
  Delete: mysql-test/suite/rpl/r/rpl_variables.result
mysql-test/r/variables.result:
  Moved mysql-test/suite/rpl/t/rpl_variables.test into
  mysql-test/t/variables.test . Result file needs to be updated.
mysql-test/t/variables.test:
  Moved mysql-test/suite/rpl/t/rpl_variables.test into
  mysql-test/t/variables.test .

into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/pushed.mysql-5.0-rpl-bug33329-extra_rollback

into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/pushed.mysql-5.0-rpl-bug33329-extra_rollback

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

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


configure.in:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_binlog.cc:
  Auto merged

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/rpl_rli.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_binlog.cc:
  Auto merged

rpl_ndb_rep_ignore
Reason: previous test, rpl_ndb_2multi_eng, does not sync slave with master
after cleanup, so tables are sometimes left on slave
Fix: sync_slave_with_master


mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
  Wait until drop table is replicated to slave before terminating. (The
  extra table caused sporadic errors in the next test case, causing
  pushbuild to fail.)

Problem: incorrect sort order for "U+00DF SHARP S".
Fix: changing sort order for U+00DF to be equal to 's',
like the manual says.



mysql-test/r/ctype_latin1_de.result:
  Adding test
mysql-test/r/ctype_uca.result:
  Adding test
mysql-test/r/ctype_ucs.result:
  Adding test
mysql-test/r/ctype_utf8.result:
  Adding test
mysql-test/t/ctype_latin1_de.test:
  Adding test
mysql-test/t/ctype_uca.test:
  Adding test
mysql-test/t/ctype_ucs.test:
  Adding test
mysql-test/t/ctype_utf8.test:
  Adding test
strings/ctype-utf8.c:
  Changing weight for "U+00DF SHARP S"
mysql-test/include/ctype_german.inc:
  New BitKeeper file ``mysql-test/include/ctype_german.inc''

mysql-test/suite/rpl_ndb/t/disabled.def:
  Disable sporadically failing test cases.

(originally from Mats)


sql/slave.cc:
  Disabling declaration in non-debug builds.

(originally from Mats)


sql/rpl_rli.cc:
  Adding variable to mark an instance of Relay_log_info as fake.
sql/rpl_rli.h:
  Adding variable to mark an instance of Relay_log_info as fake.
sql/slave.cc:
  Not printing debug information if we are working with a fake
  instance of Relay_log_info. This because the result of calling
  update is nonsense, and trying to print it generates valgrind
  warnings.
sql/sql_binlog.cc:
  Marking newly created instance of Relay_log_info as a fake instance.

into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/mysql-5.0-rpl-bug33329-extra_rollback

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


configure.in:
  Manual merge.

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

because it uses BINLOG statement, which is not supported in embedded mode.
Fix: disable the test in embedded mode.


mysql-test/suite/binlog/t/binlog_base64_flag.test:
  Must disable this test when running embedded, since BINLOG statements
  don't work. This fixes the pushbuild problem on the debx86-b machine on
  https://intranet.mysql.com/secure/pushbuild/showpush.pl?dir=mysql-5.1-new-rpl&order=469

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