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)

  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

  Add extra sleeps (conditionally) if user-ndb-object still exists during shutdown
  Note: This is not in anyway optimal, but i dont't really know in which order should be shutdown
        but it fixes problem...

into  sunlight.local:/local_work/leak_fix-5.1-mysql

(this is not a fix to the bug, but simply to disable the test in 
order to push a 5.0 to 5.1 merge)

This merge contains:

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge

  Correct memory leak fix

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge

into  mysql.com:/home/marty/MySQL/mysql-5.0

we didn't check for NULL value of the
lex_create_info->db_type pointer.
The pointer is NULL in the case, when the engine name is
unknown to the server. This happens with NDB on Windows.

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

  Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
  (only needed when >2 replica)