mysql-test/t/rpl_invoked_features.test:
  Disable warnings for some queries

into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0

manual merge with 5.0: automatic merge went incorrectly; fixing tests in rbr mode.


mysql-test/r/innodb.result:
  results changed because of some more queries are added
mysql-test/r/multi_update.result:
  results changed
mysql-test/r/rpl_row_basic_11bugs.result:
  results changed
mysql-test/t/innodb.test:
  error code is diff in 5.0
mysql-test/t/multi_update.test:
  making explicit comments and forcing execution in mixed (stmt) mode.
mysql-test/t/rpl_row_basic_11bugs.test:
  checking how binlogging works when a query on non-ta table completed partly.
sql/sql_update.cc:
  manual merge after authomatic one failed (semantic drift)

mysql-test/t/rpl_invoked_features-master.opt:
  Option file for master
mysql-test/t/rpl_invoked_features-slave.opt:
  Option file for slave

BitKeeper/deleted/.del-rpl_invoked_features.result:
  Delete: mysql-test/t/rpl_invoked_features.result
mysql-test/r/rpl_invoked_features.result:
  Result file for test case

mysql-test/t/rpl_invoked_features.result:
  result file
mysql-test/t/rpl_invoked_features.test:
  WL#3694 test case

Setting MIXED format instead of UNSPECIFIED format when server is
started without log-bin.


sql/mysqld.cc:
  Setting MIXED format instead of UNSPECIFIED format when server is
  started without log-bin.

into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0


mysql-test/t/innodb.test:
  Auto merged
mysql-test/r/innodb.result:
  manual merge use local 5.1
mysql-test/r/multi_update.result:
  manual merge
mysql-test/t/multi_update.test:
  manual merge
sql/sql_update.cc:
  manual merge

into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27716-multi_upd_no_binlog


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_update.cc:
  Auto merged

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

Implementation of mysql_multi_update did not call multi_update::send_error method in some cases 
(see the test reported on bug page and test cases in changeset).

Fixed with deploying the method, ::send_error() is refined to get binlogging code which works whenever 
there is modified non-transactional table.
thd->no_trans_update.stmt flag is set in to TRUE to ease testing though being the beginning of relative 
bug#27417 fix (addresses a part of those issues).
Eliminating two minor issues (small bugs) in multi_update methods.
This patch for multi-update also addresses a part of the issues reported in bug#13270,bug#23333.


mysql-test/r/innodb.result:
  result changed
mysql-test/r/multi_update.result:
  results changed
mysql-test/t/innodb.test:
  regression test for the bug combining transactional and non-transaction tables
mysql-test/t/multi_update.test:
  regression tests added - erred query must be binlogged
sql/sql_update.cc:
  making a call to multi_update::send_error when mysql_select return an error;
  deploying binlogging inside of ::send_error;
  refining multi_update::send_eof() to mark binlogging work done when its call to ::do_updates() errs
  and the query is binlogged with the error. ::send_error() will be called after all but
  do not do anything;
  thd->no_trans_update.stmt is corrected to be set to TRUE according to the existed code pattern. 
  Although this part relates to another bugs (bug#27417 etc) it is needed here for testing;
  Eliminating a separate issue in multi_update::do_updates where                
  either one of the class members trans_safe, transactional_tables was          
  set after the per-table loop whereas both should be calculated during         
  looping. 
  Eliminating a separate issue in ::send_eof() where thd->no_trans_update.all won't be set TRUE when
  amoung others there'd be at least one modified transactional table.
  Binlogging is done to satisfy to general character bug#13270,bug#23333 so that those won't have
  fixes specific for multi-update.

mysql-test/r/binlog_unsafe.result:
  Result change.
mysql-test/t/binlog_unsafe.test:
  Dropping used tables.

Adding missing test files. Result change in test rpl_udf.


mysql-test/r/rpl_udf.result:
  Result change
mysql-test/r/rpl_slave_skip.result:
  New BitKeeper file ``mysql-test/r/rpl_slave_skip.result''
mysql-test/t/rpl_slave_skip.test:
  New BitKeeper file ``mysql-test/t/rpl_slave_skip.test''

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


sql/sql_class.cc:
  Auto merged

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


sql/item_create.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_lex.h:
  Manual merge.

SQL_SLAVE_SKIP_COUNTER is possible):

By setting the SQL_SLAVE_SKIP_COUNTER it was possible to start the
from the middle of a group. This patch adds code so that events that
do not end a statement are ignored instead of skip counted when the
slave skip counter is 1.


sql/log_event.cc:
  Adding code so that for rows log events where the STMT_END_F is clear
  and for table map events, the event is ignored when the slave skip
  counter is 1 instead of skip counted, or described another way, the
  slave skip counter can only be decreased from 1 to 0 when the
  STMT_END_F flag is set.
sql/log_event.h:
  Adding functions Table_map_log_event::do_shall_skip() and
  Rows_log_event::do_shall_skip().

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

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


mysql-test/t/disabled.def:
  Manual merge

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl


include/config-win.h:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl


mysql-test/t/disabled.def:
  Auto merged

into  mysql.com:/home/bar/mysql-5.1.b28600


sql/field.cc:
  Auto merged

into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0


mysql-test/t/binlog_killed.test:
  manual merge bug#22725 test

refining the test because of Bug #28786 'reset master' does not reset binlogging on embeded server


mysql-test/t/binlog_killed.test:
  the test can not pass on embedded server. Setting the include-guard.

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl

mysql-test/r/rpl_ndb_basic.result:
  Masking out error that is not generated by the test itself
mysql-test/t/rpl_ndb_basic.test:
  Masking out error that is not generated by the test itself

into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl

the test is not supposed for row format. the include-guard is set.


mysql-test/t/binlog_killed.test:
  the test does not apply to rbr

into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl

  Adding strnlen.c into the list of source files.


strings/CMakeLists.txt:
  Adding strnlen.c into the list of source files.

2. Use multibyte-safe constant.


sql/sp.cc:
  Fix memory leak.
sql/sp_head.cc:
  Use multibyte-safe constant.

fixing FD event issue that showed up on pb.


client/mysqlbinlog.cc:
  resetting temp_buf specially for FD event to avoid double-freeing

into  mysql.com:/home/bar/mysql-5.1.b28558

include/config-win.h:
  strnlen() presents in the build in library only starting from
  Visual Studio 2005, identified by _MSC_VER 1400.
  Previous versions of Visual Studio didn't have this
  function, so they need the MySQL replacement function to be compiled.

Fixed test case rpl_incident.test (synchronize drop table, masked IO thread behaviour)


mysql-test/r/rpl_incident.result:
  Masking master_log_file since IO thread is not synchronized in rpl_incident.test
mysql-test/t/rpl_incident.test:
  Masking master_log_file since IO thread is not synchronized in rpl_incident.test
  Correcting drop of table so it is synchronized
sql/log_event.cc:
  Added extra parenthesis to remove compiler warning

The source of the problem was in my_vsnprintf() implementation.


strings/my_vsnprintf.c:
  Fixing a problem in vsnprintf('%.*s', len, ptr)
  When processing the above format, it's incorrect
  to use strlen() because the string is not necessarily
  a null terminated string.
  Changing strlen() followed by set_if_smaller()
  to strnlen() - which covers both cases - limiting
  by '\0' and by "len".