disable ndb_binlog_discover as it's broken
  remove debug printout

      affects basically all replication tests

  bug#21800 - 5.0 -> 5.1 merge

into  perch.ndb.mysql.com:/home/jonas/src/51-work

into  perch.ndb.mysql.com:/home/jonas/src/50-work

  read TransactionDeadlockTimeout (for scans) to cater for insane settings

  Fix so that expand_check2 is only run per fragment,
  as restore now works 1 fragment at a time (again)

  add another possible ok error in testcase

  reenable some test after adding sync_with_master to end of test
    to make sure that binlog has been applied to slave before end of test

   fix incorrect assertion in dbacc

  better error message for creating table with non-existing tablespace

  fix bug in drop_file during pageout (LCP)

  Fix bug in lcp during drop table
  Make sure that file thread is not started until meta data has completed

  Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
  This will hopefully remove some volatile testfailures in pushbuild
    (i've seen a couple by looking at logs)

  init ndb_cache_check_time and honor value in my.cnf

  Fix ndb_condition_pushdown (5.0->5.1 merge error)

  Fix build failure if O_DIRECT is not defined
  Fix stack overflow by making odirect_readbuf global
  Remove soem old debug variables

  5.1-fix adopt to changes in node recovery

into  perch.ndb.mysql.com:/home/jonas/src/51-work

into  perch.ndb.mysql.com:/home/jonas/src/51-work

into  perch.ndb.mysql.com:/home/jonas/src/50-work

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  Handle also open && !OM_INIT wrt non function O_DIRECT

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  this test in its current form depend on binlog format row

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge

  After merge fix

  Make sure updateNodeInfo is run on master also for temporary tables

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

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-rt-merge

Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: added more tests

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge

  add file that got missing from last changset