bk commit into 5.1 tree (gni:1.2340) BUG#19146

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of root. When root 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, 2006-12-14 18:10:18+08:00, gni@stripped +2 -0
  BUG #19146 If Backup parameters incorrectly set, the data nodes can't start.

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@stripped, 2006-12-14 18:10:16+08:00,
gni@stripped +12 -0
    If FailedToSetupFsBuffers in BACKUP block, it will send back DEFINE_BACKUP_REF to LQH.

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2006-12-14 18:10:16+08:00,
gni@stripped +20 -0
    If get DEFINE_BACKUP_REF signal , LQH will crash and give some messages in error log.

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.1/bug19146

--- 1.59/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2006-12-14 18:10:25 +08:00
+++ 1.60/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2006-12-14 18:10:25 +08:00
@@ -2387,6 +2387,18 @@
   if(ptr.p->is_lcp()) 
   {
     jam();
+     if (ptr.p->ctlFilePtr == RNIL) {
+       ptr.p->m_gsn = GSN_DEFINE_BACKUP_REF;
+       ndbrequire(ptr.p->errorCode != 0);
+       DefineBackupRef* ref = (DefineBackupRef*)signal->getDataPtrSend();
+       ref->backupId = ptr.p->backupId;
+       ref->backupPtr = ptr.i;
+       ref->errorCode = ptr.p->errorCode;
+       ref->nodeId = getOwnNodeId();
+       sendSignal(ptr.p->masterRef, GSN_DEFINE_BACKUP_REF, signal,
+                  DefineBackupRef::SignalLength, JBB);
+       return;
+     }
 
     BackupFilePtr filePtr LINT_SET_PTR;
     ptr.p->files.getPtr(filePtr, ptr.p->ctlFilePtr);

--- 1.126/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-12-14 18:10:25 +08:00
+++ 1.127/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-12-14 18:10:25 +08:00
@@ -566,6 +566,26 @@
 {
   jamEntry();
   m_backup_ptr = RNIL;
+  DefineBackupRef* ref = (DefineBackupRef*)signal->getDataPtrSend();
+  int err_code = 0;
+  char * extra_msg = NULL;
+
+  switch(ref->errorCode){
+    case DefineBackupRef::Undefined:
+    case DefineBackupRef::FailedToSetupFsBuffers:
+    case DefineBackupRef::FailedToAllocateBuffers: 
+    case DefineBackupRef::FailedToAllocateTables: 
+    case DefineBackupRef::FailedAllocateTableMem: 
+    case DefineBackupRef::FailedToAllocateFileRecord:
+    case DefineBackupRef::FailedToAllocateAttributeRecord:
+    case DefineBackupRef::FailedInsertFileHeader: 
+    case DefineBackupRef::FailedInsertTableList: 
+      jam();
+      err_code = NDBD_EXIT_INVALID_CONFIG;
+      extra_msg = "Probably Backup parameters configuration error, Please consult the
manual";
+      progError(__LINE__, err_code, extra_msg);
+  }
+
   sendsttorryLab(signal);
 }