bk commit into 5.0 tree (stewart:1.2018)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2018 05/09/30 14:44:24 stewart@stripped +2 -0
  more post-merge fixes for SingleUser log events

  ndb/src/mgmapi/ndb_logevent.cpp
    1.7 05/09/30 14:44:19 stewart@stripped +2 -1
    more post-merge fixes

  ndb/include/mgmapi/ndb_logevent.h
    1.5 05/09/30 14:44:19 stewart@stripped +1 -0
    more post-merge fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/main

--- 1.4/ndb/include/mgmapi/ndb_logevent.h	2005-09-29 19:01:49 +10:00
+++ 1.5/ndb/include/mgmapi/ndb_logevent.h	2005-09-30 14:44:19 +10:00
@@ -595,6 +595,7 @@
       } BackupAborted;
       /** Log event data @ref NDB_LE_SingleUser */
       struct {
+        unsigned type;
         unsigned node_id;
       } SingleUser;
 #ifndef DOXYGEN_FIX

--- 1.6/ndb/src/mgmapi/ndb_logevent.cpp	2005-09-29 19:01:50 +10:00
+++ 1.7/ndb/src/mgmapi/ndb_logevent.cpp	2005-09-30 14:44:19 +10:00
@@ -289,7 +289,8 @@
   ROW( BackupAborted,       "backup_id",     2, backup_id),
   ROW( BackupAborted,       "error",         3, error),
 
-  ROW( SingleUser,          "node_id",	     1, node_id),
+  ROW( SingleUser,          "type",	     1, type),
+  ROW( SingleUser,          "node_id",	     2, node_id),
   { NDB_LE_ILLEGAL_TYPE, 0, 0, 0, 0, 0}
 };