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

  remove bug#18385 from autotest as it only works on 2 node clusters

  minor fixes in test programs

  post merge fixes

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

  fix obscure error lookup

  Add per partition info (optionally to ndb_desc)

  Update makefile for removed files

  some more ndb-autotest updates (previously uncommitted...but in use)

  minor update to ndb-autotest.sh and config files

  Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding

  timeslice DUMP(7015)

  Partial system restart, can not try to start with higher GCI that own
  even if knowing about a higher number

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

  remove debug prinout

  Remove useless and tricky state fiddleing in TC
    to syncronize NF_CompleteRep as code is already present in DIH aswell
  Keep broadcast of TAKEOVER_TCCONF for online upgrade

  Use variable waitfor_response_timeout (depending on TransactionDeadLockTimeout)
  When getting 4012, set NeedAbort and ReleaseOnClose

  Activly abort transactions (that's affected) during NF
  This removes a lot of bugs that can occur otherwise is using
    high value for TransactionDeadLockTimout

  dont't allow node to join cluster until all nodes has completed failure handling

to binlog too much.

When InnoDB has to rollback a transaction because the lock table has
filled up, it also needs to inform the upper layer that the transaction
was rolled back so that the cached transaction is not written to the
binary log.

  8 repeated nr with table wo/ logging cause crash
  Dont create crashed replica for temporary tables

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

  Afterfix for bug#17366: Unchecked Item_int results in server crash

into sunlight.local:/work_local/17336-bug-5.0-mysql

When there is conjunction of conds, the substitute_for_best_equal_field()
will call the eliminate_item_equal() function in loop to build final
expression. But if eliminate_item_equal() finds that some cond will always
evaluate to 0, then that cond will be substituted by Item_int with value ==
0. In this case on the next iteration eliminate_item_equal() will get that 
Item_int and treat it as Item_cond. This is leads to memory corruption and
server crash on cleanup phase.

To the eliminate_item_equal() function was added DBUG_ASSERT for checking
that all items treaten as Item_cond are really Item_cond.
The substitute_for_best_equal_field() now checks that if
eliminate_item_equal() returns Item_int and it's value is 0 then this 
value is returned as the result of whole conjunction.

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

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

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

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

    ndb crash if trigger record get to big, fix incorrect max size of trigger record

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

  ndb crash if trigger record get to big, fix incorrect max size of trigger record

into  shellback.(none):/home/msvensson/mysql/mysql-5.0

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.20-bug15101-sysdate

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

into  mysql.com:/home/mydev/mysql-4.1-bug14980

into  mysql.com:/home/mydev/mysql-5.0-bug14980