bzr push into mysql-5.1-telco-7.0 branch (jonas:4394 to 4395)

[Jonas Oreland]

 4395 Jonas Oreland	2011-05-19
      ndb - assign errno 17000-17999 to Dbspj

    modified:
      storage/ndb/src/kernel/blocks/ERROR_codes.txt
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
 4394 Jonas Oreland	2011-05-18
      ndb - use thrjamX() in Dbdih::execDIGETNODES and Dbdih::execDIVERIFYREQ

    modified:
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/ERROR_codes.txt'
--- a/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2011-04-28 07:47:53 +0000
+++ b/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2011-05-19 07:32:39 +0000
@@ -29,6 +29,7 @@ Next DBTUX 12010
 Next SUMA 13047
 Next LGMAN 15001
 Next TSMAN 16001
+Next DBSPJ 17000
 
 TESTING NODE FAILURE, ARBITRATION
 ---------------------------------

=== modified file 'storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp'
--- a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2011-05-02 13:36:19 +0000
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2011-05-19 07:32:39 +0000
@@ -1431,6 +1431,11 @@ void Cmvmi::execTAMPER_ORD(Signal* signa
     jam();
     tuserblockref = TSMAN_REF;
   }
+  else if (errNo < 18000)
+  {
+    jam();
+    tuserblockref = DBSPJ_REF;
+  }
   else if (errNo < 30000)
   {
     /*--------------------------------------------------------------------*/

No bundle (reason: useless for push emails).