Commit e0940a36 authored by unknown's avatar unknown
Browse files

Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj 

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19620


sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
parents a70a46b4 a6ed306e

storage/ndb/src/mgmclient/CommandInterpreter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2410,7 +2410,7 @@ CommandInterpreter::executeStartBackup(char* parameters) 
  }



  if (result != 0) {

    ndbout << "Start of backup failed" << endl;

    ndbout << "Backup failed" << endl;

    printError();

#if 0

    close(fd);

storage/ndb/src/mgmsrv/Services.cpp

+7 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "../mgmapi/ndb_logevent.hpp"



#include <base64.h>

#include <ndberror.h>



extern bool g_StopServer;

extern bool g_RestartServer;
@@ -1315,6 +1316,12 @@ Ndb_mgmd_event_service::log(int eventType, const Uint32* theData, NodeId nodeId) 
    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;

storage/ndb/src/ndbapi/ndberror.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ ErrorBundle ErrorCodes[] = { 
  { 1305, DMEC, IE, "Backup definition not implemented" },

  { 1306, DMEC, AE, "Backup not supported in diskless mode (change Diskless)" },



  { 1321, DMEC, IE, "Backup aborted by application" },

  { 1321, DMEC, UD, "Backup aborted by user request" },

  { 1322, DMEC, IE, "Backup already completed" },

  { 1323, DMEC, IE, "1323" },

  { 1324, DMEC, IE, "Backup log buffer full" },