into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1

mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test:
  Rename: mysql-test/suite/ndb/t/ndb_dd_backuprestore.test -> mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test
mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result:
  Rename: mysql-test/suite/ndb/r/ndb_dd_backuprestore.result -> mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result
mysql-test/suite/ndb_team/r/ndb_backup_print.result:
  Rename: mysql-test/suite/ndb/r/ndb_backup_print.result -> mysql-test/suite/ndb_team/r/ndb_backup_print.result
mysql-test/suite/ndb_team/t/ndb_backup_print.test:
  Rename: mysql-test/suite/ndb/t/ndb_backup_print.test -> mysql-test/suite/ndb_team/t/ndb_backup_print.test

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


configure.in:
  merge fix

into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1

mysql-test/suite/ndb/t/disabled.def:
  bug#32759 already fixed
  - see rev 1.131.1.6 of sql/ha_ndbcluster_binlog.cc

into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1


storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  ul

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
  manual merge
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
  manual merge

(bug not present in 5.1)

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


Makefile.am:
  Auto merged
configure.in:
  null merge version change
scripts/mysql_install_db.sh:
  manual merge
scripts/mysql_system_tables_data.sql:
  manual merge

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


configure.in:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged

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


client/mysqldump.c:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

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

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/ha_ndbcluster_binlog.cc:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl:
  Add a way to remove options which mysql-test-run.pl no longer uses.  Since
  mysql-test-run.pl passes unrecognized options through to mysqld directly,
  it is not possible to just remove an option.  Otherwise it would be given
  to mysqld, which probably will not recognize it and will fail to start.
  
  Instead, we now explicitly ignore the option, and print a warning to
  the user.

into  five.local.lan:/work/merge/mysql-5.1-build-parts

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

    Makefile syntax error, comment should precede the whole target.


Makefile.am:
  Makefile syntax error, comment should precede the whole target.

into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Merge

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

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

into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Merge