into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

  Post-merge fix: replace xid=* with XID to isolate from number of transactions

into  alf.:D:/src/mysql-5.1-maint_winemb

- Add build configuration parameter EMBEDDED_ONLY which will configure 
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

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

Correcting the logic for deciding when to use delete_all_rows() so that
the behavior of TRUNCATE to not be dependent on binary logging
format in effect.

A TRUNCATE statement is always logged as a statement, so in this case,
delete_all_rows() can always be used provided the other logic is correct.
If a DELETE FROM without a WHERE clause is used, and row-based binlogging
is used, the rows has to be deleted from the table on a per-row basis.

into  mysql.com:/home/ram/work/mysql-5.1-maint

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

mysql-test/include/wait_for_slave_io_to_stop.inc
mysql-test/include/wait_for_slave_sql_to_stop.inc
mysql-test/include/wait_for_slave_to_start.inc
mysql-test/include/wait_for_slave_to_stop.inc
from 5.1

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1

into  damien-katzs-computer.local:/Users/dkatz/51_win

into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50

into  trift2.:/MySQL/M51/push-5.1