mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052

Browse source 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Manual merged
This commit is contained in:
unknown 2006-08-15 19:32:35 +00:00
commit 1b0a7c4dc1
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/ndb/src/mgmclient/CommandInterpreter.cpp
View file

@ -2085,7 +2085,7 @@ CommandInterpreter::executeStartBackup(char* parameters)
}
if (result != 0) {
ndbout << "Start of backup failed" << endl;
ndbout << "Backup failed" << endl;
printError();
#if 0
close(fd);

7
storage/ndb/src/mgmsrv/Services.cpp
View file

@ -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;

2
storage/ndb/src/ndbapi/ndberror.c
View file

@ -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" },