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".

Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug27044_slave_dup2unique
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0


sql/log_event.cc:
  Auto merged

merge 5.0 with 5.1


mysql-test/t/binlog_killed.test:
  offset change in 5.1

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

test comments correction


mysql-test/r/binlog_killed.result:
  changed
mysql-test/t/binlog_killed.test:
  wrong comments (but important ones) left;
  little refinement in result calc

Problem: Unicode->UJIS followed incorrect conversion
rules for U+00A5 YEN SIGN and U+203E OVERLINE,
so these characters were converted to ujis 0x8E5C
and 0x8E7E accordingly.

This behaviour would be correct for a JIS-X-0201 based character set,
but this is wrong for UJIS, which is documented as x-eucjp-unicode-0.9,
and which is based on ASCII for the range U+0000..U+007F.

Fix:
removing JIS-X-0201 conversion rules, making UJIS ASCII compatible.
YEN SIGN and OVERLINE do not have corresponding UJIS characters anymore
and converted to 0x3F QUESTION MARK, throwing a warning in appropriative cases.

This patch also includes a test covering full UJIS->Unicode->UJIS mapping.


sql/field.cc:
  Nicer error message format:
  always use HEX notation when printing warnings about UCS2 values -
  this is more readable.
strings/ctype-ujis.c:
  Removing incorrect Unicode->UJIS mapping.
  MySQL "UJIS" is x-eucjp-unicode-0.9.
mysql-test/r/ctype_ujis_ucs2.result:
  New BitKeeper file ``mysql-test/r/ctype_ujis_ucs2.result''
mysql-test/t/ctype_ujis_ucs2.test:
  New BitKeeper file ``mysql-test/t/ctype_ujis_ucs2.test''

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

combining the final result variable in such way that either option of the test execution
will yield zero.


mysql-test/r/binlog_killed.result:
  results changed
mysql-test/t/binlog_killed.test:
  there are two options for the test passing:
  1. no rows inserted and the INSERT gets killed, then there is no INSERT query in binlog
  2. all rows inserted, then INSERT gets to binlog and error_code is zero

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge


sql/sp_head.cc:
  Auto merged

sql/sp_head.cc:
  Manual merge, bug#27876
sql/sql_lex.cc:
  Manual merge, bug#27876
sql/sql_lex.h:
  Manual merge, bug#27876
sql/sql_view.cc:
  Manual merge, bug#27876
tests/mysql_client_test.c:
  Manual merge, bug#27876

tests refining, see binlog_killed.test file for details


mysql-test/r/binlog_killed.result:
  results changed
mysql-test/t/binlog_killed.test:
  killer conn waits for the first row to appear;
  log-disabling kill query since prey's id is not deterministic;
  correcting pattern to search in binlog for insert query;

merge with 5.0


sql/sql_class.cc:
  THD::binlog_query receives killed status arg with default the same for Query_log_event
sql/sql_class.h:
  relocation public binlog_query down to the point where killed_state is declared

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


sql/sql_insert.cc:
  Auto merged

refining the test.


mysql-test/t/binlog_killed.test:
  due to killing reap may catch an error though it's indeterministic.

into  ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-cs-3