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

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

  backport fix from 5.1

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

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

  make lockpages=1 run a bit earlier in startup

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

  increase timeout on slow test

  Fix testcase so that it does not leak tables...causing subsequent errors

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

    Fix bug when restarting cluster after failure
      (fs was not cleared)
    Fix cosmetic bug that made rsync be run several times when gathering result

  fix ao_ignore behavior change in hugo
  (affecting testOperations & testTransactions)

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

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge

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

  new file

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

    remove compiler warning EventLogger.cpp
    Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
     - partial fix
     - object map to handle failed realloc

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb

- do not call function if table has no autoincrement

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge

getting BACKUP_FRAGMENT_REF in LQH from BACKUP would bail on
ndbrequire(false) instead of having good error message.

Can re-use error code from BACKUP as it's a FsRef error code,
which is NDBD_EXIT... except when it isn't.

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work

remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing

Remove the dead SET_VAR_REQ,REF,CONF signals.

They:
a) don't currently work
b) will cause confusion with future mgmd updates for
   signal interface to configuration things (e.g. port numbers)

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

remove GSN_STATISTICS_REQ and CONF

These are unused and have been since BK import. not needed.

Don't send uninit data in TAMPER_ORD to DIHNDBTAMPER

Even though this data is unused from the CMVMI (mgmd) signal,
we shouldn't be doing stuff with uninited data.

there is backwards compatibility for GET CONFIG style configuration requests in
ndb_mgmd. None of the ndbd versions that use this couldn't possibly connect to a
5.0 or 5.1 cluster. remove the backwards compat

remove it

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb

indicate units in SocketOutputStream timeout

rename timeout in SocketOutputStream to reflect units (ms)

In 5.0 as well as is safe cleanup patch that will help with merging.

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb

- signals where sometimes sent too early when setting up subscriptions

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

into  eel.(none):/home/jonas/src/51-work

into  zippy.cornsilk.net:/home/cmiller/work/mysql/tmpmerge