merge to 5.1

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

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

  fix deadlock if master switches log file in parallell with "show master logs"
  

  Add order by in rpl_(ndb)_multi_update3 to make result deterministic

  fix backup/lcp race

  Snapup testBackup XXXerror

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

  Improve error message when detecting corrupted REDO log

  adopt to new error code 755 (invalid tablespace)

  disable ndb_autodiscover3 (cluster restart (--initial))

  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