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:/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:/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>

  Problem: for character sets having mbmaxlen==2,
  any ALTER TABLE changed TEXT column type to MEDIUMTEXT,
  due to wrong "internal length to create length" formula.
  Fix: removing rounding code introduced in early 4.1 time,
  which is not correct anymore.

  Adding a multibyte-aware VARCHAR copying function, to put correct column prefix,
  taking in account number of characters (instead just limiting on number of bytes).
  For example, for a KEY(col(3)) on a UTF8 column when copying the string 'foo bar foo',
  we should put only 3 leftmost characters: 'foo'.
  9 characters were incorrectly put before this fix.

  After merge fix

into  moonbone.local:/work/5505-bug-5.0-opt-mysql

On an INSERT into an updatable but non-insertable view an error message was
issued stating the view being not updatable. This can lead to a confusion of a
user.

A new error message is introduced. Is is showed when a user tries to insert
into a non-insertable view.

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.0

 - reversed the patch for 5.0 and moved to 5.1

into  mysql.com:/home/hf/work/mysql-5.0-mrg

into  mysql.com:/home/hf/work/mysql-4.1.15428

into  trift2.:/MySQL/M50/push-5.0

into  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21646

into  rurik.mysql.com:/home/igor/mysql-5.0-opt

Presence of a subquery in the ON expression of a join 
should not block merging the view that contains this join.
Before this patch the such views were converted into 
into temporary table views.

an ALL/ANY quantified subquery in HAVING.
The Item::split_sum_func2 method should not create Item_ref
for objects of any class derived from Item_subselect.

into  mysql.com:/home/hf/work/mysql-5.0-mrg

into  mysql.com:/home/hf/work/mysql-4.1.15428

into  mysql.com:/home/hf/work/mysql-4.1.15428

into  mysql.com:/Users/kent/mysql/bk/mysql-5.0

  Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
  Filter out icc specific options from cflags/libs(_r)

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

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

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

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

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

into  trift2.:/MySQL/M50/push-5.0