From: Date: February 14 2007 6:49am
Subject: bk commit into 5.1 tree (stewart:1.2435) BUG#20121
List-Archive: http://lists.mysql.com/commits/19835
X-Bug: 20121
Message-Id: <20070214054948.28F8A14036E2@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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@stripped, 2007-02-14 16:49:40+11:00, stewart@willster.(none) +1 -0
  BUG#20121 missing err msg for ENOSPC
  
  getting BACKUP_FRAGMENT_REF in LQH from BACKUP would bail on
  ndbrequire(false) instead of having good error message.
  
  Can re-use error code from BACKUP as it's a FsRef error code,
  which is NDBD_EXIT... except when it isn't.

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-02-14 16:49:37+11:00, stewart@willster.(none) +12 -1
    Report the correct error code on exit with failure to backup fragment (run LCP)

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb-work

--- 1.133/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-14 16:35:29 +11:00
+++ 1.134/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-02-14 16:49:37 +11:00
@@ -62,6 +62,7 @@
 #include <signaldata/AttrInfo.hpp>
 #include <KeyDescriptor.hpp>
 #include <signaldata/RouteOrd.hpp>
+#include <signaldata/FsRef.hpp>
 
 // Use DEBUG to print messages that should be
 // seen only when we debug the product
@@ -11434,7 +11435,17 @@
 
 void Dblqh::execBACKUP_FRAGMENT_REF(Signal* signal) 
 {
-  ndbrequire(false);
+  BackupFragmentRef *ref= (BackupFragmentRef*)signal->getDataPtr();
+  char buf[100];
+  BaseString::snprintf(buf,sizeof(buf),
+                       "Unable to store fragment during LCP. NDBFS Error: %u",
+                       ref->errorCode);
+
+  progError(__LINE__,
+            (ref->errorCode & FsRef::FS_ERR_BIT)?
+            NDBD_EXIT_AFS_UNKNOWN
+            : ref->errorCode,
+            buf);
 }
 
 void Dblqh::execBACKUP_FRAGMENT_CONF(Signal* signal)