Commit 2f6d8c45 authored by unknown's avatar unknown

Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug21296-5.1.12


storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
parents 0945d120 ad128072
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <NdbHost.h> #include <NdbHost.h>
#include <NdbConfig.h> #include <NdbConfig.h>
#include <Configuration.hpp> #include <Configuration.hpp>
#include "EventLogger.hpp"
#include <NdbAutoPtr.hpp> #include <NdbAutoPtr.hpp>
...@@ -39,7 +40,7 @@ static void dumpJam(FILE* jamStream, ...@@ -39,7 +40,7 @@ static void dumpJam(FILE* jamStream,
Uint32 thrdTheEmulatedJamIndex, Uint32 thrdTheEmulatedJamIndex,
Uint8 thrdTheEmulatedJam[]); Uint8 thrdTheEmulatedJam[]);
extern EventLogger g_eventLogger;
const char* const char*
ErrorReporter::formatTimeStampString(){ ErrorReporter::formatTimeStampString(){
TimeModule DateTime; /* To create "theDateTimeString" */ TimeModule DateTime; /* To create "theDateTimeString" */
...@@ -196,6 +197,9 @@ ErrorReporter::handleError(int messageID, ...@@ -196,6 +197,9 @@ ErrorReporter::handleError(int messageID,
WriteMessage(messageID, problemData, WriteMessage(messageID, problemData,
objRef, theEmulatedJamIndex, theEmulatedJam); objRef, theEmulatedJamIndex, theEmulatedJam);
g_eventLogger.info(problemData);
g_eventLogger.info(objRef);
childReportError(messageID); childReportError(messageID);
if(messageID == NDBD_EXIT_ERROR_INSERT){ if(messageID == NDBD_EXIT_ERROR_INSERT){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment