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

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.

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 .

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''

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

Problem: mysqlbinlog does not free memory if an error happens.
Fix: binlog-processing functions do not call exit() anymore. Instead, they
print an error and return an error code. Error codes are propagated all
the way back to main, and all allocated memory is freed on the way.


client/mysqlbinlog.cc:
  - New error handling policy: functions processing binlogs don't just
    exit() anymore. Instead, they print a message and return an error
    status.
  - New policy for the global `mysql' and `glob_description_event': these
    are not passed as parameters anymore. The global pointer is used
    instead.
  - More error situations are detected and reported.
  - Better error messages: the program never terminates with exit status 1
    without explanation any more. Fixed spelling errors. Use consistent
    format of messages (a single line beginning with "ERROR: " or
    "WARNING: " and ending with "." is printed to stderr.)
  - New memory handling: memory is always freed on program termination.
  - Better comments: more functions are explained, doxygen is used, and
    more precise formulations in some existing comments.
mysql-test/suite/binlog/r/binlog_base64_flag.result:
  Result file updated since output format of mysqlbinlog changed while the
  test was disabled.
mysql-test/suite/binlog/t/binlog_killed.test:
  Mysqlbinlog now works as described when the binlog is open. Hence, the
  --force-if-open flag must be passed
mysql-test/suite/binlog/t/binlog_killed_simulate.test:
  Mysqlbinlog now works as described when the binlog is open. Hence, the
  --force-if-open flag must be passed
mysql-test/suite/binlog/t/disabled.def:
  Now that mysqlbinlog cleans up after itself on abnormal termination, we
  can enable this test again.

Documented Table_map_log_event and packed integer format. Improved
other documentation. No change outside comments.


sql/log_event.h:
  Documented Table_map_log_event and packed integer format. Improved
  other documentation. No change outside comments.

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


mysql-test/suite/binlog/t/binlog_old_versions.test:
  Auto merged

limit for v7 tar.


mysql-test/suite/binlog/std_data/ver_5_1_17.001:
  Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001 -> mysql-test/suite/binlog/std_data/ver_5_1_17.001
mysql-test/suite/binlog/std_data/ver_5_1_23.001:
  Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001 -> mysql-test/suite/binlog/std_data/ver_5_1_23.001
mysql-test/suite/binlog/std_data/ver_5_1-telco.001:
  Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-telco.001
mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001:
  Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001
mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001:
  Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001
mysql-test/suite/binlog/std_data/bug32407.001:
  Rename: mysql-test/suite/binlog/std_data/binlog-bug32407.000001 -> mysql-test/suite/binlog/std_data/bug32407.001

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


sql/slave.cc:
  Auto merged

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

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


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

into  riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.1-new-rpl


client/mysqlbinlog.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged

slash in filenames also for Create_file_log_event.


client/mysqlbinlog.cc:
  BUG#34355: mysqlbinlog outputs backslash as path separator for 4.1 binlogs
  Problem: When the windows version of mysqlbinlog reads 4.1 binlogs
  containing LOAD DATA INFILE, it outputs backslashes as path separators in
  filenames. However, the output is typically piped to a client, and client
  expects forward slashes.
  Fix: Replace '\\' by '/' in filenames.

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.

mysql-test/mysql-test-run.pl:
  Removing duplicate code.

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

mysql-test/suite/binlog/t/binlog_old_versions.test:
  Adding --local-load to 'mysqlbinlog' and --local-infile=1 to 'mysql'.

    to leave

The artifact was caused by
a flaw in concurrent accessing the slave's io thd by
the io itself and a handling show slave status thread.
Namely, show_master_info did not acquire mi->run_lock mutex that is
specified for mi->io_thd member.

Fixed with deploying the mutex locking and unlocking. The mutex is kept
short time and without interleaving with mi->data_lock mutex.

Todo: to report and fix an issue with 
    sys_var_slave_skip_counter::{methods} 
seem to acquire incorrectly
     active_mi->rli.run_lock
instead of the specified
     active_mi->rli.data_lock

A test case is difficult to compose, so rpl_packet should continue serving
as the indicator.


sql/slave.cc:
  implementing a TODO left at 4.1 time:
  mending access to mi->io_thd with the specified mutex;
sql/slave.h:
  adding a member name to the list of that run_lock guards.

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


include/my_base.h:
  Auto merged
mysql-test/include/show_binlog_events2.inc:
  Auto merged
mysql-test/suite/binlog/t/binlog_old_versions.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt:
  Auto merged
mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/sql_binlog.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_loaddata_map.result:
  Manual merge.
mysql-test/suite/rpl/r/rpl_user.result:
  Manual merge.
mysql-test/suite/rpl/t/rpl_loaddata_map.test:
  Manual merge.
mysql-test/suite/rpl/t/rpl_user.test:
  Manual merge.
sql/log_event.cc:
  Manual merge.
sql/rpl_record.cc:
  Manual merge.

cause sporadic, but benign, errors.


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

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.

into  riska.(none):/home/sven/bk/b34141-mysqlbinlog_4.1_binlogs/5.1-new-rpl


sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged

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.