database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-22 19:52:58 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2006-08-16 17:46:40 +08:00
parent a70a46b4fa a6ed306eb0
commit e0940a36ae
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -33,6 +33,7 @@
#include "../mgmapi/ndb_logevent.hpp" #include "../mgmapi/ndb_logevent.hpp"
#include <base64.h> #include <base64.h>
#include <ndberror.h>
extern bool g_StopServer; extern bool g_StopServer;
extern bool g_RestartServer; 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) if (ndb_logevent_body[i].index_fn)
val= (*(ndb_logevent_body[i].index_fn))(val); val= (*(ndb_logevent_body[i].index_fn))(val);
str.appfmt("%s=%d\n",ndb_logevent_body[i].token, 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; 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" }, { 1305, DMEC, IE, "Backup definition not implemented" },
{ 1306, DMEC, AE, "Backup not supported in diskless mode (change Diskless)" }, { 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" }, { 1322, DMEC, IE, "Backup already completed" },
{ 1323, DMEC, IE, "1323" }, { 1323, DMEC, IE, "1323" },
{ 1324, DMEC, IE, "Backup log buffer full" }, { 1324, DMEC, IE, "Backup log buffer full" },