sync using replicate-wild-ignore-table
Problem: changes in character set variables
before an action on an replication-ignored table
makes slave to forget new variable values.
Fix: initialize one_shot variables only when
4.1 -> 5.x replication is running.

into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0

into  mysql.com:/usr/home/bar/mysql-5.0-rpl.b22052

into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0

Transaction on the slave sql thread got blocked against a slave's mysqld local ta's
lock. Since the default, slave-transaction-retries=10, there was replaying of the 
replicated ta. That failed because of a new started from 5.0.13 policy not to rollback
a timed-out transaction. Effectively the first round of a timed-out ta becomes committed
by the replaying's first "BEGIN".

It was decided to backport already existed method working in 5.1 implemented in
bug #16228 for handling symmetrical deadlock problem. That patch introduced end_trans
execution whenever a replicated ta deadlocks or timed-out.

Note, that this solution can be practically suboptimal - in the light of the changed behavior
due to timeout we still could replay only the last statement -  only with a high rate of timeouting
replicated transactions.

into  mysql.com:/home/bk/MERGE/mysql-5.0-merge

into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines

This is addition to fix for bug21617. Valgrind reports an error when
opening merge table that has underlying tables with less indexes than
in a merge table itself.

Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
This fixes problems when merge table and subtables have different number of keys.

into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines

Though this is not storage engine specific problem, I was able to
repeat this problem with BDB and NDB engines only. That was the
reason to add a test case into ndb_update.test. As a result
different bad things could happen.

BDB has removed duplicate rows which is not expected.
NDB returns an error.

For multi table update notify storage engine about UPDATE IGNORE
as it is done in single table UPDATE.

into  mysql.com:/usr/home/bar/mysql-5.0-rpl

  Fix: using charset-aware functions cs->cset->lengthsp() and cs->cset->fill()
  instead of single byte code which is not UCS2 compatible.

into  mysql.com:/usr/home/bar/mysql-5.0-rpl

into  mysql.com:/usr/home/bar/mysql-4.1-rpl

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines

into  chilla.local:/home/mydev/mysql-4.0-bug20719

into  chilla.local:/home/mydev/mysql-5.0-bug20627

into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines

Was introduced with patch for bug#21675.

into  chilla.local:/home/mydev/mysql-5.0-bug20627

into  chilla.local:/home/mydev/mysql-4.1-bug22384

into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines

into  chilla.local:/home/mydev/mysql-5.0-bug22384

into  mysql.com:/usr/home/bar/mysql-5.0.b6147rpl

  
  Fix: "mysql --xml" now print NULL values the same way that "mysqldump --xml" does:
  
    <field name="name" xsi:nil="true" />
  
  to distinguish from empty strings:
  
    <field name="name"></field>
  
  and from string "NULL":
  
    <field name="name">NULL</field>