diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-09-03 11:29:58 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-09-03 11:29:58 +0200 |
| commit | 79b85087c0cd66c7e4726c1aec0b9ad61c745939 (patch) | |
| tree | 8f312af982cf1524855659bbcdaf75e2a67f7fb1 /storage | |
| parent | 867d4ee0c77f32f43bf4b0c3ecc45154fada28a6 (diff) | |
| download | mariadb-git-79b85087c0cd66c7e4726c1aec0b9ad61c745939.tar.gz | |
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)
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/ERROR_codes.txt | 2 | ||||
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp | 2 | ||||
| -rw-r--r-- | storage/ndb/test/ndbapi/testIndex.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/storage/ndb/src/kernel/blocks/ERROR_codes.txt b/storage/ndb/src/kernel/blocks/ERROR_codes.txt index 6d53d242d71..be02ae312c2 100644 --- a/storage/ndb/src/kernel/blocks/ERROR_codes.txt +++ b/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 diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp index 6a05abe7bf7..887e6f848b1 100644 --- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp +++ b/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 diff --git a/storage/ndb/test/ndbapi/testIndex.cpp b/storage/ndb/test/ndbapi/testIndex.cpp index 626e43ab5e2..00e559c7a0f 100644 --- a/storage/ndb/test/ndbapi/testIndex.cpp +++ b/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 |