into  romeo.(none):/home/bk/b20265-mysql-5.1-new-rpl

---
BUG#20265 (Replication of CREATE-SELECT does not work correctly):
Fixing bug by making binary log handle statement transactions.
The binary log transaction cache can now be truncated to remove 
events inserted during this statement or transaction. Also, the
binary log participate in XA transaction handling, although not
as a full 2pc resource.

  After merge fix.
field.cc:
  After merge fix

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/bkroot/mysql-5.1-new-rpl

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

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

into  romeo.(none):/home/bk/fix-mysql-5.1-new-rpl

Adding test case.

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

This  patch makes ndbcluster_hton not static. I have a second patch for ndbcluster_hton to be static, but I want to talk to Jonas first. 

into  zim.(none):/home/brian/mysql/merge-5.1

into  zim.(none):/home/brian/mysql/arch-5.1

This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call. 

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

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

into  mysql.com:/home/psergey/mysql-5.1-bug14940-r10a

- Re-worked the prev_record_reads() function to return the lower bound of
  number of different table access scans that will be performed.

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.

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

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

  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  zim.(none):/home/brian/mysql/merge-5.1

into  zim.(none):/home/brian/mysql/merge-5.1

  binlog_row_binlog.test failure in team tree.
  Fixing the result that gets wrong with --binlog-format=mixed
(so that skipped on pushbuild currently)