Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51

into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug14935

Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug14935
e46d5957 · unknown · 0336144b · 93ce96ca · e46d5957
Commit e46d5957 authored 18 years ago by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp +1 -1

No files found.
--- 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;