bk commit into 5.1 tree (pekka:1.2220) BUG#14935

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2220 06/06/19 10:50:23 pekka@stripped +1 -0
  ndb - bug#14935 : Correct error to TUX on node alloc fail.  There is more bugs with db full.

  storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
    1.20 06/06/19 10:47:22 pekka@stripped +1 -1
    set ZMEM_NOMEM_ERROR correctly when TUX fails to alloc node from TUP

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51-bug14935

--- 1.19/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2006-03-01 10:18:56 +01:00
+++ 1.20/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2006-06-19 10:47:22 +02:00
@@ -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;