From: Maitrayi Sabaratnam
Date: March 15 2012 4:34pm
Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (maitrayi.sabaratnam:3600 to 3601)
List-Archive: http://lists.mysql.com/commits/143219
Message-Id: <20120315163436.16084.qmail@asator03>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3601 Maitrayi Sabaratnam	2012-03-15
      Fixing compilor warnings

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 3600 Maitrayi Sabaratnam	2012-03-15
      SPJ: handling dupsection failures

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/test/ndbapi/testSpj.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2012-03-15 14:33:38 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2012-03-15 16:30:49 +0000
@@ -3241,7 +3241,7 @@ Dbspj::lookup_send(Signal* signal,
     return;
   }
   while (0);
-error:
+
   ndbrequire(err);
   jam();
   abort(signal, requestPtr, err);
@@ -6946,6 +6946,10 @@ Dbspj::appendFromParent(Uint32 & dst, Lo
     // should have been expanded during build
     DEBUG_CRASH();
     return DbspjErr::InvalidPattern;
+  default:
+    jam();
+    DEBUG_CRASH();
+    return DbspjErr::InvalidPattern;
   }
 }
 

No bundle (reason: useless for push emails).