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

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

The client program 'mysqlbinlog' crashed when trying to print a User_var_log_event holding
a floating-point value since the format specifier for my_b_printf() does not support
floating-point format specifiers.

This patch prints the floating-point number to an internal buffer, and then writes
that buffer to the output instead.


mysql-test/r/mysqlbinlog.result:
  Result file change.
mysql-test/t/mysqlbinlog.test:
  Adding test that mysqlbinlog can write and read back User_var_log_event
  for real, decimal, integer, and string. These are the only types supported
  for user variables.
sql/log_event.cc:
  Using my_sprintf() to print floating-point value of User_var_log_event value to a
  character buffer and then to the real output, since my_b_printf() does not
  support floating-point format. Also adding macro to give buffer size needed 
  for printing floating-point numbers in %g format.

- Reorganize collect a little to make it easier to apply optimizations
  and settings to collected test cases.
- Add suite/rpl/combination file
- Rename include/set_binlog_format_x.inc to .sql since thay are run by "mysql"
 


mysql-test/include/set_binlog_format_mixed.sql:
  Rename: mysql-test/include/set_binlog_format_mixed.inc -> mysql-test/include/set_binlog_format_mixed.sql
mysql-test/include/set_binlog_format_row.sql:
  Rename: mysql-test/include/set_binlog_format_row.inc -> mysql-test/include/set_binlog_format_row.sql
mysql-test/include/set_binlog_format_statement.sql:
  Rename: mysql-test/include/set_binlog_format_statement.inc -> mysql-test/include/set_binlog_format_statement.sql
mysql-test/lib/mtr_cases.pl:
  Reorganize code to
   - collect a suite
   - multiply the tests in the suite with any combinations the suite has
   - optimize the suite by skipping test not supported with current settings
  Use My::Config to read combinations file in my.cnf file format, this
  allowas a "short name" to be used for the combination instead of
  the full name wich is set to the extra arguments the combination applies
  Add function 'print_testcase' that can be used to print the testcases
  during different stages of the collect phase
mysql-test/lib/mtr_report.pl:
  Print <testname> '<combination>' if combination is set
mysql-test/mysql-test-run.pl:
  Add comments, fix indentation
  Rename .in to .sql files
  Only set binlog format dynamicall for master, slav is always restarted
mysql-test/lib/My/Config.pm:
  New BitKeeper file ``mysql-test/lib/My/Config.pm''
mysql-test/suite/rpl/combinations:
  New BitKeeper file ``mysql-test/suite/rpl/combinations''

into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl

mysql-test/mysql-test-run.pl:
  added --skip-combination option
mysql-test/lib/mtr_cases.pl:
  skip combination code for some conditions
mysql-test/include/have_binlog_format_row_or_statement.inc:
  include file

The patch I previously pushed for this bug did not compile because
a field in class THD had been renamed.
This patch renames thd->query_error to thd->is_slave_error in
log_event_old.cc by applying the same patch to log_event_old.cc as
was previously applied to log_event.cc.


sql/log_event_old.cc:
  Renames thd->query_error to thd->is_slave_error in
  log_event_old.cc by applying the same patch to log_event_old.cc as
  was previously applied to log_event.cc.

into  riska.(none):/home/sven/bk/b31581-5.1.22-rbr_slave_crash


sql/log_event_old.cc:
  Auto merged

mysql-test/lib/mtr_cases.pl:
  fixed path to combination file

mysql-test/mysql-test-run.pl:
  updated mtr
mysql-test/include/set_binlog_format_mixed.inc:
  set mixed binlog format
mysql-test/include/set_binlog_format_row.inc:
  set row binlog format
mysql-test/include/set_binlog_format_statement.inc:
  set statement binlog format

This patch has two purposes:
(1) To refactor the code so that
   {Write|Update|Delete}_rows_log_event_old does not use code from
   {Write|Update|Delete}_rows_log_event. Before refactoring there
   was the following problem: whenever we modifed the code for new
   events, it affected the old events. This is bad, as it makes
   maintainance difficult. After refactoring, we can safely edit the
   new code without affecting old events. So, if we for instance
   modify the binary format of new events, we no longer need to worry
   about how the new code reads old events.
(2) To fix BUG#31581.

These two objectives are reached by the following changes:
 - Merged Rows_log_event into Old_rows_log_event and
   {Write|Update|Delete}_rows_log_event into
   {Write|Update|Delete}_rows_log_event_old.
 - Fixed the bug by replacing {WRITE|UPDATE|DELETE}_ROWS_EVENT by
   PRE_GA_{WRITE|UPDATE|DELETE}_ROWS_EVENT.
 - Added comments to log_event_old.h

(This patch is identical to the previously committed patch which was
a collapse of three changesets, except that it adds assert(0) to
constructors for old types of row log events that should never be
called.)


sql/log_event_old.cc:
  Merged Rows_log_event into Old_rows_log_event and
  {Write|Update|Delete}_rows_log_event into
  {Write|Update|Delete}_rows_log_event_old. Also fixed the bug by
  replacing {WRITE|UPDATE|DELETE}_ROWS_EVENT by
  PRE_GA_{WRITE|UPDATE|DELETE}_ROWS_EVENT.
sql/log_event_old.h:
  Merged Rows_log_event into Old_rows_log_event and
  {Write|Update|Delete}_rows_log_event into
  {Write|Update|Delete}_rows_log_event_old. Also added comment
  explaining what the file contains and what the classes do.

mysql-test/lib/mtr_cases.pl:
  updated the code for combination
mysql-test/mysql-test-run.pl:
  added soft switching of binlog format
mysql-test/lib/mtr_misc.pl:
  added new sub mtr_diff_opts
mysql-test/suite/rpl/r/rpl_invoked_features.result:
  updated result
mysql-test/suite/rpl/t/rpl_invoked_features.test:
  updated test
mysql-test/suite/rpl/t/rpl_misc_functions.test:
  updated test
mysql-test/suite/rpl/t/rpl_session_var.test:
  updated test

sql/sql_delete.cc:
  Correcting merge error.

sql/ha_ndbcluster.cc:
  Reverting previous changes done to DBUG_ENTER strings.

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


mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
  Auto merged
mysql-test/suite/rpl/r/rpl_bug31076.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_bug31076.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/partition.test:
  Manual merge.
BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
  Manual merge.
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
  Manual merge.
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
  Manual merge.
mysql-test/suite/rpl/t/disabled.def:
  Manual merge.
sql/sql_delete.cc:
  Manual merge.

into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug31170-rpl_innodb_bug28430_fails


mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  manual merge

Adding missing drop of user created for test case.


mysql-test/r/mysqlbinlog.result:
  Result file change.
mysql-test/t/mysqlbinlog.test:
  Dropping user that was added earlier in the test.

Pushing test case for bug only. Bug already fixed as a result of the patch for BUG#19958.


mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Adding test to see that no error is given on slave when deleting
  rows that don't exist on table without primary key.
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
  Result change.
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
  Result change.
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
  Result change.

mysql-test/suite/rpl/r/rpl_found_rows.result:
  Result change.
mysql-test/suite/rpl/t/rpl_found_rows.test:
  Adding ORDER BY to avoid order dependencies.
  Setting BINLOG_FORMAT=MIXED; for all master clients: one were missing.
  Dropping procedures that polluted later test results.

Non-deterministic parameters  of  SHOW SLAVE STATUS are masked out
by means of using the standard include-macro.

The masked-out parameters are not needed by the logics of the original
tests. What is need to demonstre that replication is not stopped remains.



mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  results changed
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  using the standard macro that takes care of masking out env specific values

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

mysql-test/suite/rpl/t/rpl_trigger.test:
  Disabling warnings to prevent different result files for
  MIXED and STATEMENT mode.

into  kindahl-laptop.dnsalias.net:/home/bk/b31611-mysql-5.1-target-5.1.22


sql/sql_binlog.cc:
  Auto merged

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

DBUG_OFF #ifdefs to eliminate two warnings in replication tree.

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

into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1


mysql-test/suite/binlog/r/binlog_killed.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_killed.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_temporary.test:
  manual merge
sql/log.cc:
  manual merge

into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags

refining non-deterministic tests.
The new Bug@32148 is in the way. Adjuting the tests to be somehow useful.
 


mysql-test/r/binlog_killed.result:
  results changed
mysql-test/t/binlog_killed.test:
  refining the tests as killing is inherently non-deterministic;
  leaving todos.

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-runtime

tests fixing: refreshing the results file.


mysql-test/suite/binlog/r/binlog_killed.result:
  results changed

In BUG#30244 added FOUND_ROWS() as an unsafe function, but that
works only in mixed mode under 5.1. There is a workaround that
can be used in statement-based mode either under 5.0 or 5.1
where the result of FOUND_ROWS() is stored into a user vari-
able and used that way instead. This will replicate correctly
even under statement-based replication, since it will write
a User_var entry to the binary log. For some other cases, the
value has to be passed explicitly.

This patch adds tests to demonstrate that the workarounds docu-
mented for statement-based replication works as advertised, and
does more extensive tests for cases that does not work under sta-
tement-based replication actually work under mixed mode by switch-
ing to row-based replication.


mysql-test/include/reset_master_and_slave.inc:
  New BitKeeper file ``mysql-test/include/reset_master_and_slave.inc''
mysql-test/suite/rpl/r/rpl_found_rows.result:
  New BitKeeper file ``mysql-test/suite/rpl/r/rpl_found_rows.result''
mysql-test/suite/rpl/t/rpl_found_rows.test:
  New BitKeeper file ``mysql-test/suite/rpl/t/rpl_found_rows.test''

into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug28597-log_name_upgrade

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

into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1


BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt:
  Auto merged
BitKeeper/deleted/.del-binlog_killed_bug27571.test:
  Auto merged

fixing tests


mysql-test/r/binlog_killed_simulate.result:
  the new tests' result

into  magare.gmz:/home/kgeorge/mysql/autopush/B31974-5.1-runtime