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

 loose index scan enabled for subqueries


mysql-test/r/group_min_max.result:
  Bug #31974: test case updates
   loose index scan enabled for subqueries
mysql-test/r/index_merge_myisam.result:
  Bug #31974: test case updates
   loose index scan enabled for subqueries

removing extra tests (on 5.1 that's been already done)


BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt:
  Delete: mysql-test/t/binlog_killed_bug27571-master.opt
BitKeeper/deleted/.del-binlog_killed_bug27571.test:
  Delete: mysql-test/t/binlog_killed_bug27571.test

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


mysql-test/suite/binlog/r/binlog_killed.result:
  manual merge ul
mysql-test/suite/binlog/t/binlog_killed.test:
  manual merge with 5.0 specific tests; use local
mysql-test/suite/binlog/t/binlog_killed_simulate.test:
   manual merge with 5.0 specific tests; use local
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_regexp.test:
  Auto merged
mysql-test/r/ctype_ucs.result:
  automerge
mysql-test/r/ctype_utf8.result:
  automerge
mysql-test/r/func_regexp.result:
  automerge
mysql-test/t/ctype_utf8.test:
  automerge
sql/item_cmpfunc.cc:
  automerge
sql/item_cmpfunc.h:
  automerge
sql/sql_class.h:
  automerge
sql/sql_insert.cc:
  automerge
sql/sql_parse.cc:
  automerge
sql/sql_update.cc:
  automerge

commit is specific for 5.0 to eliminated non-deterministic tests.
Those tests run only in 5.1 env where there is a necessary devices such
as processlist table of info_schema.


mysql-test/r/binlog_killed.result:
  results changed
mysql-test/t/binlog_killed.test:
  removing non-deterministic part of the test
mysql-test/t/binlog_killed_simulate.test:
  adding the guard same as for 5.1 version

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


sql/sql_insert.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

non-deterministic tests refining.
This particular patch tested on two archs.


mysql-test/suite/binlog/t/binlog_killed.test:
  deploying synchronization of killing with reaching the explected state
  of the prey's connection.

non-deterministic tests execution on some platforms.


mysql-test/suite/binlog/r/binlog_killed.result:
  results changed
mysql-test/suite/binlog/t/binlog_killed.test:
  correcting the prev test's cleanup;
  increasing time to wait by to be killed query;
  adding the masking out error due to Bug@32140 wrong error code caught when an SF() call is interruped with KILL query

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

sql/sql_yacc.yy:
  Fixed coding style (tabs)