bzr push into mysql-5.1 branch (jonas:3189 to 3190)

[Jonas Oreland]

 3190 Jonas Oreland	2008-12-22
      ndb - fix merge error of new error path
modified:
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

 3189 Tomas Ulin	2008-12-22
      control ndb exec mode from mtr
modified:
  mysql-test/mysql-test-run.pl
  mysql-test/ndb/ndb_config_1_node.ini
  mysql-test/ndb/ndb_config_2_node.ini
  mysql-test/ndb/ndb_config_4_node.ini
  storage/ndb/src/kernel/main.cpp

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-12-22 09:40:33 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-12-22 15:32:02 +0000
@@ -3819,6 +3819,7 @@ void Dblqh::execLQHKEYREQ(Signal* signal
     ptrCheckGuard(Thostptr, chostFileSize, hostRecord);
     if (unlikely(Thostptr.p->nodestatus != ZNODE_UP))
     {
+      releaseSections(handle);
       noFreeRecordLab(signal, lqhKeyReq, ZNODE_FAILURE_ERROR);
       return;
     }
@@ -3877,8 +3878,8 @@ void Dblqh::execLQHKEYREQ(Signal* signal
       m_commitAckMarkerHash.seize(markerPtr);
       if (markerPtr.i == RNIL)
       {
-        noFreeRecordLab(signal, lqhKeyReq, ZNO_FREE_MARKER_RECORDS_ERROR);
         releaseSections(handle);
+        noFreeRecordLab(signal, lqhKeyReq, ZNO_FREE_MARKER_RECORDS_ERROR);
         return;
       }
       markerPtr.p->transid1 = sig1;