Commit c04d04ec authored by unknown's avatar unknown

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

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

parents f6a65b02 d3d3ba7a
...@@ -63,7 +63,7 @@ Dbtup::tuxAllocNode(Signal* signal, ...@@ -63,7 +63,7 @@ Dbtup::tuxAllocNode(Signal* signal,
if ((ptr= alloc_fix_rec(fragPtr.p, tablePtr.p, &key, &frag_page_id)) == 0) if ((ptr= alloc_fix_rec(fragPtr.p, tablePtr.p, &key, &frag_page_id)) == 0)
{ {
ljam(); ljam();
ndbrequire(terrorCode != 0); terrorCode = ZMEM_NOMEM_ERROR; // caller sets error
return terrorCode; return terrorCode;
} }
pageId= key.m_page_no; pageId= key.m_page_no;
......
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