bk commit into 5.0 tree (lzhou:1.2244) BUG#21052

[lzhou]

Below is the list of changes that have just been committed into a local
5.0 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-08-14 18:34:36+08:00, lzhou@stripped +3 -0
  BUG#21052 Modify error message when backup is aborted

  ndb/src/mgmclient/CommandInterpreter.cpp@stripped, 2006-08-14 18:34:34+08:00,
lzhou@stripped +1 -1
    Modify error message when backup is aborted

  ndb/src/mgmsrv/Services.cpp@stripped, 2006-08-14 18:34:34+08:00, lzhou@stripped
+8 -0
    Append error message when error event occor

  ndb/src/ndbapi/ndberror.c@stripped, 2006-08-14 18:34:34+08:00, lzhou@stripped +1
-1
    Modify error message

# 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:	lzhou
# Host:	dev3-138.dev.cn.tlan
# Root:	/home/zhl/mysql/mysql-5.0/bug21052

--- 1.61/ndb/src/mgmclient/CommandInterpreter.cpp	2006-08-14 18:34:42 +08:00
+++ 1.62/ndb/src/mgmclient/CommandInterpreter.cpp	2006-08-14 18:34:42 +08:00
@@ -2138,7 +2138,7 @@
   }
 
   if (result != 0) {
-    ndbout << "Start of backup failed" << endl;
+    ndbout << "Backup failed" << endl;
     printError();
 #if 0
     close(fd);

--- 1.66/ndb/src/mgmsrv/Services.cpp	2006-08-14 18:34:42 +08:00
+++ 1.67/ndb/src/mgmsrv/Services.cpp	2006-08-14 18:34:42 +08:00
@@ -33,6 +33,7 @@
 #include "../mgmapi/ndb_logevent.hpp"
 
 #include <base64.h>
+#include <ndberror.h>
 
 extern bool g_StopServer;
 extern bool g_RestartServer;
@@ -1324,6 +1325,13 @@
     if (ndb_logevent_body[i].index_fn)
       val= (*(ndb_logevent_body[i].index_fn))(val);
     str.appfmt("%s=%d\n",ndb_logevent_body[i].token, val);
+    if(strcmp(ndb_logevent_body[i].token,"error") == 0)
+    {
+      int m_text_len= strlen(m_text);
+      snprintf(m_text+m_text_len, 4 , " - ");
+      ndb_error_string(theData[3], m_text+(m_text_len+3), sizeof(m_text)-m_text_len-3);
+    }
+
   }
 
   Vector<NDB_SOCKET_TYPE> copy;

--- 1.46/ndb/src/ndbapi/ndberror.c	2006-08-14 18:34:42 +08:00
+++ 1.47/ndb/src/ndbapi/ndberror.c	2006-08-14 18:34:42 +08:00
@@ -378,7 +378,7 @@
   { 1305, IE, "Backup definition not implemented" },
   { 1306, AE, "Backup not supported in diskless mode (change Diskless)" },
 
-  { 1321, IE, "Backup aborted by application" },
+  { 1321, UD, "Backup aborted by user request" },
   { 1322, IE, "Backup already completed" },
   { 1323, IE, "1323" },
   { 1324, IE, "Backup log buffer full" },