summaryrefslogtreecommitdiff
path: root/ndb/src/kernel
diff options
context:
space:
mode:
authorunknown <stewart@mysql.com>2005-09-29 19:01:53 +1000
committerunknown <stewart@mysql.com>2005-09-29 19:01:53 +1000
commitaa1c81b1500aa9cfcd126d0e0742a443c29d4537 (patch)
treee85829f808527209dfc300a9265c5905c8699e27 /ndb/src/kernel
parentaaeb2b38a56802a773525bccb1ffdcfc7e60f173 (diff)
downloadmariadb-git-aa1c81b1500aa9cfcd126d0e0742a443c29d4537.tar.gz
merge fixes - SingleUser logging
ndb/include/mgmapi/ndb_logevent.h: Merge fix - add SingleUser log events ndb/src/common/debugger/EventLogger.cpp: merge fix - add text for SingleUser log events. ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: merge fix ndb/src/mgmapi/ndb_logevent.cpp: add SingeUser log info
Diffstat (limited to 'ndb/src/kernel')
-rw-r--r--ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
index 60f3c4e83cd..e50e6bd242b 100644
--- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
+++ b/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
@@ -1963,7 +1963,7 @@ Ndbcntr::execRESUME_REQ(Signal* signal){
jamEntry();
- signal->theData[0] = EventReport::SingleUser;
+ signal->theData[0] = NDB_LE_SingleUser;
signal->theData[1] = 2;
sendSignal(CMVMI_REF, GSN_EVENT_REP, signal, 2, JBB);
@@ -2248,7 +2248,7 @@ void Ndbcntr::execABORT_ALL_CONF(Signal* signal){
c_stopRec.stopReq.senderRef = 0; // the command is done
- signal->theData[0] = EventReport::SingleUser;
+ signal->theData[0] = NDB_LE_SingleUser;
signal->theData[1] = 1;
signal->theData[2] = c_stopRec.stopReq.singleUserApi;
sendSignal(CMVMI_REF, GSN_EVENT_REP, signal, 3, JBB);