diff options
| author | unknown <pekka@orca.ndb.mysql.com> | 2006-06-22 21:22:46 +0200 |
|---|---|---|
| committer | unknown <pekka@orca.ndb.mysql.com> | 2006-06-22 21:22:46 +0200 |
| commit | e46d595723f06cd04319071623033626c2a49683 (patch) | |
| tree | 998894889ff465f5cad921a9f7cd028f7a0930a3 /storage | |
| parent | 0336144b2c92d27432b36a5117483bd0a12aca0b (diff) | |
| parent | 93ce96cab9cfc726ddf283b3cc95705cb6ae1bd8 (diff) | |
| download | mariadb-git-e46d595723f06cd04319071623033626c2a49683.tar.gz | |
Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug14935
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp index b51cc02a703..878fe77d998 100644 --- a/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp +++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp @@ -63,7 +63,7 @@ Dbtup::tuxAllocNode(Signal* signal, if ((ptr= alloc_fix_rec(fragPtr.p, tablePtr.p, &key, &frag_page_id)) == 0) { ljam(); - ndbrequire(terrorCode != 0); + terrorCode = ZMEM_NOMEM_ERROR; // caller sets error return terrorCode; } pageId= key.m_page_no; |