diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-08-30 10:46:32 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-08-30 10:46:32 +0200 |
| commit | 77f2400af9ad527385b80d67f7d4dfcbf4633f62 (patch) | |
| tree | 90e19a32bb3152915590d8250ee609491d9fba1f /storage/ndb/src/ndbapi/ndberror.c | |
| parent | cfb1ba010700b88a4ba6a9183e28db43b8fe7d2c (diff) | |
| parent | cc0750aceeb29fae7fd6544a5e46ed5b9c61d1d2 (diff) | |
| download | mariadb-git-77f2400af9ad527385b80d67f7d4dfcbf4633f62.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
manual merge
storage/ndb/src/ndbapi/ndberror.c:
manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
manual merge
Diffstat (limited to 'storage/ndb/src/ndbapi/ndberror.c')
| -rw-r--r-- | storage/ndb/src/ndbapi/ndberror.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c index 914acd17c08..10ecc8e5f25 100644 --- a/storage/ndb/src/ndbapi/ndberror.c +++ b/storage/ndb/src/ndbapi/ndberror.c @@ -189,6 +189,7 @@ ErrorBundle ErrorCodes[] = { { 4032, DMEC, TR, "Out of Send Buffer space in NDB API" }, { 1501, DMEC, TR, "Out of undo space" }, { 288, DMEC, TR, "Out of index operations in transaction coordinator (increase MaxNoOfConcurrentIndexOperations)" }, + { 289, DMEC, TR, "Out of transaction buffer memory in TC (increase TransactionBufferMemory)" }, /** * InsufficientSpace |