Commit 5f7d8493 authored by unknown's avatar unknown

bug#16738 - ndb dd - out of diskspace

  fix typo + add error code to printable list


storage/ndb/include/kernel/signaldata/Extent.hpp:
  Set correct error code
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  err is already negative
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Set correct error code
storage/ndb/src/ndbapi/ndberror.c:
  Add error code to printable list
parent ded8417d
...@@ -32,7 +32,7 @@ struct AllocExtentReq { ...@@ -32,7 +32,7 @@ struct AllocExtentReq {
enum ErrorCode { enum ErrorCode {
UnmappedExtentPageIsNotImplemented = 1, UnmappedExtentPageIsNotImplemented = 1,
NoExtentAvailable = 2 NoExtentAvailable = 1601
}; };
union union
......
...@@ -270,11 +270,9 @@ Dbtup::disk_page_prealloc(Signal* signal, ...@@ -270,11 +270,9 @@ Dbtup::disk_page_prealloc(Signal* signal,
if ((err= tsman.alloc_extent(&ext.p->m_key)) < 0) if ((err= tsman.alloc_extent(&ext.p->m_key)) < 0)
{ {
//XXX
c_extent_pool.release(ext); c_extent_pool.release(ext);
c_page_request_pool.release(req); c_page_request_pool.release(req);
ndbout_c("no free extent"); return err;
return -err;
} }
int pages= err; int pages= err;
......
...@@ -1439,6 +1439,7 @@ int Dbtup::handleInsertReq(Signal* signal, ...@@ -1439,6 +1439,7 @@ int Dbtup::handleInsertReq(Signal* signal,
int ret= disk_page_prealloc(signal, fragPtr, &tmp, size); int ret= disk_page_prealloc(signal, fragPtr, &tmp, size);
if (unlikely(ret < 0)) if (unlikely(ret < 0))
{ {
terrorCode = -ret;
goto disk_prealloc_error; goto disk_prealloc_error;
} }
......
...@@ -80,6 +80,7 @@ static const char* empty_string = ""; ...@@ -80,6 +80,7 @@ static const char* empty_string = "";
* 1300 - BACKUP * 1300 - BACKUP
* 1400 - SUMA * 1400 - SUMA
* 1500 - LGMAN * 1500 - LGMAN
* 1600 - TSMAN
* 4000 - API * 4000 - API
* 4100 - "" * 4100 - ""
* 4200 - "" * 4200 - ""
...@@ -197,6 +198,7 @@ ErrorBundle ErrorCodes[] = { ...@@ -197,6 +198,7 @@ ErrorBundle ErrorCodes[] = {
{ 903, HA_ERR_INDEX_FILE_FULL, IS, "Too many ordered indexes (increase MaxNoOfOrderedIndexes)" }, { 903, HA_ERR_INDEX_FILE_FULL, IS, "Too many ordered indexes (increase MaxNoOfOrderedIndexes)" },
{ 904, HA_ERR_INDEX_FILE_FULL, IS, "Out of fragment records (increase MaxNoOfOrderedIndexes)" }, { 904, HA_ERR_INDEX_FILE_FULL, IS, "Out of fragment records (increase MaxNoOfOrderedIndexes)" },
{ 905, DMEC, IS, "Out of attribute records (increase MaxNoOfAttributes)" }, { 905, DMEC, IS, "Out of attribute records (increase MaxNoOfAttributes)" },
{ 1601, HA_ERR_RECORD_FILE_FULL, IS, "Out extents, tablespace full" },
/** /**
* TimeoutExpired * TimeoutExpired
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment