bzr commit into mysql-5.1 branch (jonas:2705)

[jonas]

#At file:///home/jonas/src/telco-6.4/

 2705 jonas@stripped	2008-08-11 [merge]
      merge
modified:
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-08-11 11:30:18 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2008-08-11 11:31:48 +0000
@@ -4067,9 +4067,10 @@ void Dblqh::execLQHKEYREQ(Signal* signal
     tmp = (tmp < 0 ? - tmp : tmp);
     if ((tmp <= 1) || (tfragDistKey == 0)) {
       LQHKEY_abort(signal, 0);
+      return;
     }//if
     LQHKEY_error(signal, 1);
-    return;
+    // Never get here
   }//if
 
   /*