ndb - merge error code(s)

storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge error code(s)
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge error code(s)
storage/ndb/test/ndbapi/testIndex.cpp:
  merge error code(s)

storage/ndb/src/kernel/blocks/ERROR_codes.txt

@@ -304,7 +304,7 @@ ABORT OF TCKEYREQ
 
 8038 : Simulate API disconnect just after SCAN_TAB_REQ
 
-8039 : Simulate failure of TransactionBufferMemory allocation for OI lookup
+8052 : Simulate failure of TransactionBufferMemory allocation for OI lookup
 
 8051 : Simulate failure of allocation for saveINDXKEYINFO
 

storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

@@ -11840,7 +11840,7 @@ Dbtc::saveINDXKEYINFO(Signal* signal,
                       const Uint32 *src, 
                       Uint32 len)
 {
-  if (ERROR_INSERTED(8039) || !indexOp->keyInfo.append(src, len)) {
+  if (ERROR_INSERTED(8052) || !indexOp->keyInfo.append(src, len)) {
     jam();
     // Failed to seize keyInfo, abort transaction
 #ifdef VM_TRACE

storage/ndb/test/ndbapi/testIndex.cpp

@@ -1386,7 +1386,7 @@ int tcSaveINDX_test(NDBT_Context* ctx, NDBT_Step* step, int inject_err)
 int
 runBug28804(NDBT_Context* ctx, NDBT_Step* step)
 {
-  return tcSaveINDX_test(ctx, step, 8039);
+  return tcSaveINDX_test(ctx, step, 8052);
 }
 
 int