bk commit into 5.1 tree (mtaylor:1.2550)

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor.  When mtaylor 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@stripped, 2008-03-12 11:09:16-05:00, mtaylor@solace.(none) +1 -0
  Made the individual log events named rather than anonymous. 

  storage/ndb/include/mgmapi/ndb_logevent.h@stripped, 2008-03-12 11:09:15-05:00,
mtaylor@solace.(none) +485 -399
    Made the individual log events named rather than anonymous. 

diff -Nrup a/storage/ndb/include/mgmapi/ndb_logevent.h
b/storage/ndb/include/mgmapi/ndb_logevent.h
--- a/storage/ndb/include/mgmapi/ndb_logevent.h	2008-02-11 08:05:02 -06:00
+++ b/storage/ndb/include/mgmapi/ndb_logevent.h	2008-03-12 11:09:15 -05:00
@@ -1,4 +1,7 @@
-/* Copyright (C) 2003 MySQL AB
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+   vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+
+   Copyright (C) 2003 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -198,7 +201,7 @@ extern "C" {
   };
 
   /**
-   *   Log event severities (used to filter the cluster log, 
+   *   Log event severities (used to filter the cluster log,
    *   ndb_mgm_set_clusterlog_severity_filter(), and filter listening to events
    *   ndb_mgm_listen_event())
    */
@@ -288,6 +291,417 @@ extern "C" {
 #endif
   };
 
+  /* CONNECT */
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct st_Connected {
+    unsigned node;
+  };
+
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_Disconnected {
+    unsigned node;
+  };
+
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_CommunicationClosed {
+    unsigned node;
+  };
+
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_CommunicationOpened {
+    unsigned node;
+  };
+
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_ConnectedApiVersion{
+    unsigned node;
+    unsigned version;
+  };
+
+  /* CHECKPOINT */
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_GlobalCheckpointStarted{
+    unsigned gci;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_GlobalCheckpointCompleted{
+    unsigned gci;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_LocalCheckpointStarted{
+    unsigned lci;
+    unsigned keep_gci;
+    unsigned restore_gci;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_LocalCheckpointCompleted{
+    unsigned lci;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_LCPStoppedInCalcKeepGci{
+    unsigned data;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_LCPFragmentCompleted{
+    unsigned node;
+    unsigned table_id;
+    unsigned fragment_id;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_UndoLogBlocked{
+    unsigned acc_count;
+    unsigned tup_count;
+  };
+
+  /* STARTUP */
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NDBStartStarted{
+    unsigned version;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NDBStartCompleted{
+    unsigned version;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_STTORRYRecieved{
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_StartPhaseCompleted{
+    unsigned phase;
+    unsigned starttype;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_CM_REGCONF{
+    unsigned own_id;
+    unsigned president_id;
+    unsigned dynamic_id;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_CM_REGREF{
+    unsigned own_id;
+    unsigned other_id;
+    unsigned cause;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_FIND_NEIGHBOURS{
+    unsigned own_id;
+    unsigned left_id;
+    unsigned right_id;
+    unsigned dynamic_id;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NDBStopStarted{
+    unsigned stoptype;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NDBStopCompleted{
+    unsigned action;
+    unsigned signum;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NDBStopForced{
+    unsigned action;
+    unsigned signum;
+    unsigned error;
+    unsigned sphase;
+    unsigned extra;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NDBStopAborted{
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_StartREDOLog{
+    unsigned node;
+    unsigned keep_gci;
+    unsigned completed_gci;
+    unsigned restorable_gci;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_StartLog{
+    unsigned log_part;
+    unsigned start_mb;
+    unsigned stop_mb;
+    unsigned gci;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_UNDORecordsExecuted{
+    unsigned block;
+    unsigned data1;
+    unsigned data2;
+    unsigned data3;
+    unsigned data4;
+    unsigned data5;
+    unsigned data6;
+    unsigned data7;
+    unsigned data8;
+    unsigned data9;
+    unsigned data10;
+  };
+
+  /* NODERESTART */
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NR_CopyDict{
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NR_CopyDistr{
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NR_CopyFragsStarted{
+    unsigned dest_node;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NR_CopyFragDone{
+    unsigned dest_node;
+    unsigned table_id;
+    unsigned fragment_id;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NR_CopyFragsCompleted{
+    unsigned dest_node;
+  };
+
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NodeFailCompleted{
+    unsigned block; /* 0 = all */
+    unsigned failed_node;
+    unsigned completing_node; /* 0 = all */
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_NODE_FAILREP{
+    unsigned failed_node;
+    unsigned failure_state;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_ArbitState{
+    unsigned code;                /* code & state << 16 */
+    unsigned arbit_node;
+    unsigned ticket_0;
+    unsigned ticket_1;
+    /* TODO */
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_ArbitResult{
+    unsigned code;                /* code & state << 16 */
+    unsigned arbit_node;
+    unsigned ticket_0;
+    unsigned ticket_1;
+    /* TODO */
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_GCP_TakeoverStarted{
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_GCP_TakeoverCompleted{
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_LCP_TakeoverStarted{
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_LCP_TakeoverCompleted{
+    unsigned state;
+  };
+
+  /* STATISTIC */
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_TransReportCounters{
+    unsigned trans_count;
+    unsigned commit_count;
+    unsigned read_count;
+    unsigned simple_read_count;
+    unsigned write_count;
+    unsigned attrinfo_count;
+    unsigned conc_op_count;
+    unsigned abort_count;
+    unsigned scan_count;
+    unsigned range_scan_count;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_OperationReportCounters{
+    unsigned ops;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_TableCreated{
+    unsigned table_id;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_JobStatistic{
+    unsigned mean_loop_count;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_SendBytesStatistic{
+    unsigned to_node;
+    unsigned mean_sent_bytes;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_ReceiveBytesStatistic{
+    unsigned from_node;
+    unsigned mean_received_bytes;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_MemoryUsage{
+    int      gth;
+    /* union is for compatibility backward.
+     * page_size_kb member variable should be removed in the future
+     */
+    union {
+      unsigned page_size_kb;
+      unsigned page_size_bytes;
+    };
+    unsigned pages_used;
+    unsigned pages_total;
+    unsigned block;
+  };
+
+  /* ERROR */
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_TransporterError{
+    unsigned to_node;
+    unsigned code;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_TransporterWarning{
+    unsigned to_node;
+    unsigned code;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_MissedHeartbeat{
+    unsigned node;
+    unsigned count;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_DeadDueToHeartbeat{
+    unsigned node;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_WarningEvent{
+    /* TODO */
+  };
+
+  /* INFO */
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_SentHeartbeat{
+    unsigned node;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_CreateLogBytes{
+    unsigned node;
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_InfoEvent{
+    /* TODO */
+  };
+  /** Log event specific data for for corresponding NDB_LE_ log event */
+  struct  st_EventBufferStatus{
+    unsigned usage;
+    unsigned alloc;
+    unsigned max;
+    unsigned apply_gci_l;
+    unsigned apply_gci_h;
+    unsigned latest_gci_l;
+    unsigned latest_gci_h;
+  };
+
+  /** Log event data for @ref NDB_LE_BackupStarted */
+  struct  st_BackupStarted{
+    unsigned starting_node;
+    unsigned backup_id;
+  };
+  /** Log event data @ref NDB_LE_BackupFailedToStart */
+  struct  st_BackupFailedToStart{
+    unsigned starting_node;
+    unsigned error;
+  };
+  /** Log event data @ref NDB_LE_BackupCompleted */
+  struct  st_BackupCompleted{
+    unsigned starting_node;
+    unsigned backup_id;
+    unsigned start_gci;
+    unsigned stop_gci;
+    unsigned n_records;
+    unsigned n_log_records;
+    unsigned n_bytes;
+    unsigned n_log_bytes;
+    unsigned n_records_hi;
+    unsigned n_log_records_hi;
+    unsigned n_bytes_hi;
+    unsigned n_log_bytes_hi;
+  };
+  /** Log event data @ref NDB_LE_BackupStatus */
+  struct  st_BackupStatus{
+    unsigned starting_node;
+    unsigned backup_id;
+    unsigned n_records_lo;
+    unsigned n_records_hi;
+    unsigned n_log_records_lo;
+    unsigned n_log_records_hi;
+    unsigned n_bytes_lo;
+    unsigned n_bytes_hi;
+    unsigned n_log_bytes_lo;
+    unsigned n_log_bytes_hi;
+  };
+  /** Log event data @ref NDB_LE_BackupAborted */
+  struct  st_BackupAborted{
+    unsigned starting_node;
+    unsigned backup_id;
+    unsigned error;
+  };
+  /** Log event data @ref NDB_LE_RestoreStarted */
+  struct  st_RestoreStarted{
+    unsigned backup_id;
+    unsigned node_id;
+  };
+  /** Log event data @ref NDB_LE_RestoreMetaData */
+  struct  st_RestoreMetaData{
+    unsigned backup_id;
+    unsigned node_id;
+    unsigned n_tables;
+    unsigned n_tablespaces;
+    unsigned n_logfilegroups;
+    unsigned n_datafiles;
+    unsigned n_undofiles;
+  };
+  /** Log event data @ref NDB_LE_RestoreData */
+  struct  st_RestoreData{
+    unsigned backup_id;
+    unsigned node_id;
+    unsigned n_records_lo;
+    unsigned n_records_hi;
+    unsigned n_bytes_lo;
+    unsigned n_bytes_hi;
+  };
+  /** Log event data @ref NDB_LE_RestoreLog */
+  struct  st_RestoreLog{
+    unsigned backup_id;
+    unsigned node_id;
+    unsigned n_records_lo;
+    unsigned n_records_hi;
+    unsigned n_bytes_lo;
+    unsigned n_bytes_hi;
+  };
+  /** Log event data @ref NDB_LE_RestoreCompleted */
+  struct  st_RestoreCompleted{
+    unsigned backup_id;
+    unsigned node_id;
+  };
+  /** Log event data @ref NDB_LE_SingleUser */
+  struct  st_SingleUser{
+    unsigned type;
+    unsigned node_id;
+  };
+  /** Log even data @ref NDB_LE_StartReport */
+  struct  st_StartReport{
+    unsigned report_type;
+    unsigned remaining_time;
+    unsigned bitmask_size;
+    unsigned bitmask_data[1];
+  };
+  /** Log event data @ref NDB_LE_SubscriptionStatus */
+  struct  st_SubscriptionStatus {
+    unsigned report_type;
+    unsigned node_id;
+  };
+
+
   /**
    * Structure to store and retrieve log event information.
    * @see @ref secSLogEvents
@@ -321,414 +735,86 @@ extern "C" {
      */
     union {
       /* CONNECT */
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned node;
-      } Connected;
-
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned node;
-      } Disconnected;
-
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned node;
-      } CommunicationClosed;
-
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned node;
-      } CommunicationOpened;
-
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned node;
-	unsigned version;
-      } ConnectedApiVersion;
+      struct st_Connected Connected;
+      struct st_Disconnected Disconnected;
+      struct st_CommunicationClosed CommunicationClosed;
+      struct st_CommunicationOpened CommunicationOpened;
+      struct st_ConnectedApiVersion ConnectedApiVersion;
 
       /* CHECKPOINT */
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned gci;
-      } GlobalCheckpointStarted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned gci;
-      } GlobalCheckpointCompleted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned lci;
-	unsigned keep_gci;
-	unsigned restore_gci;
-      } LocalCheckpointStarted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned lci;
-      } LocalCheckpointCompleted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned data;
-      } LCPStoppedInCalcKeepGci;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned node;
-	unsigned table_id;
-	unsigned fragment_id;
-      } LCPFragmentCompleted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned acc_count;
-	unsigned tup_count;
-      } UndoLogBlocked;
+      struct st_GlobalCheckpointStarted  GlobalCheckpointStarted;
+      struct st_GlobalCheckpointCompleted  GlobalCheckpointCompleted;
+      struct st_LocalCheckpointStarted  LocalCheckpointStarted;
+      struct st_LocalCheckpointCompleted  LocalCheckpointCompleted;
+      struct st_LCPStoppedInCalcKeepGci  LCPStoppedInCalcKeepGci;
+      struct st_LCPFragmentCompleted  LCPFragmentCompleted;
+      struct st_UndoLogBlocked  UndoLogBlocked;
 
       /* STARTUP */
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned version;
-      } NDBStartStarted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned version;
-      } NDBStartCompleted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-      } STTORRYRecieved;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned phase;
-	unsigned starttype;
-      } StartPhaseCompleted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned own_id;
-	unsigned president_id;
-	unsigned dynamic_id;
-      } CM_REGCONF;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned own_id;
-	unsigned other_id;
-	unsigned cause;
-      } CM_REGREF;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned own_id;
-	unsigned left_id;
-	unsigned right_id;
-	unsigned dynamic_id;
-      } FIND_NEIGHBOURS;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned stoptype;
-      } NDBStopStarted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned action;
-	unsigned signum;
-      } NDBStopCompleted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned action;
-	unsigned signum;
-	unsigned error;
-	unsigned sphase;
-	unsigned extra;
-      } NDBStopForced;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-      } NDBStopAborted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned node;
-	unsigned keep_gci;
-	unsigned completed_gci;
-	unsigned restorable_gci;
-      } StartREDOLog;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned log_part;
-	unsigned start_mb;
-	unsigned stop_mb;
-	unsigned gci;
-      } StartLog;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned block;
-	unsigned data1;
-	unsigned data2;
-	unsigned data3;
-	unsigned data4;
-	unsigned data5;
-	unsigned data6;
-	unsigned data7;
-	unsigned data8;
-	unsigned data9;
-	unsigned data10;
-      } UNDORecordsExecuted;
-  
+      struct st_NDBStartStarted  NDBStartStarted;
+      struct st_NDBStartCompleted  NDBStartCompleted;
+      struct st_STTORRYRecieved  STTORRYRecieved;
+      struct st_StartPhaseCompleted  StartPhaseCompleted;
+      struct st_CM_REGCONF  CM_REGCONF;
+      struct st_CM_REGREF  CM_REGREF;
+      struct st_FIND_NEIGHBOURS  FIND_NEIGHBOURS;
+      struct st_NDBStopStarted  NDBStopStarted;
+      struct st_NDBStopCompleted  NDBStopCompleted;
+      struct st_NDBStopForced  NDBStopForced;
+      struct st_NDBStopAborted  NDBStopAborted;
+      struct st_StartREDOLog  StartREDOLog;
+      struct st_StartLog  StartLog;
+      struct st_UNDORecordsExecuted  UNDORecordsExecuted;
+
       /* NODERESTART */
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-      } NR_CopyDict;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-      } NR_CopyDistr;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned dest_node;
-      } NR_CopyFragsStarted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned dest_node;
-	unsigned table_id;
-	unsigned fragment_id;
-      } NR_CopyFragDone;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned dest_node;
-      } NR_CopyFragsCompleted;
-
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned block; /* 0 = all */
-	unsigned failed_node;
-	unsigned completing_node; /* 0 = all */
-      } NodeFailCompleted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned failed_node;
-	unsigned failure_state;
-      } NODE_FAILREP;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned code;                /* code & state << 16 */
-	unsigned arbit_node;
-	unsigned ticket_0;
-	unsigned ticket_1;
-	/* TODO */
-      } ArbitState;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned code;                /* code & state << 16 */
-	unsigned arbit_node;
-	unsigned ticket_0;
-	unsigned ticket_1;
-	/* TODO */
-      } ArbitResult;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-      } GCP_TakeoverStarted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-      } GCP_TakeoverCompleted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-      } LCP_TakeoverStarted;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned state;
-      } LCP_TakeoverCompleted;
+      struct st_NR_CopyDict  NR_CopyDict;
+      struct st_NR_CopyDistr  NR_CopyDistr;
+      struct st_NR_CopyFragsStarted  NR_CopyFragsStarted;
+      struct st_NR_CopyFragDone  NR_CopyFragDone;
+      struct st_NR_CopyFragsCompleted  NR_CopyFragsCompleted;
+      struct st_NodeFailCompleted  NodeFailCompleted;
+      struct st_NODE_FAILREP  NODE_FAILREP;
+      struct st_ArbitState  ArbitState;
+      struct st_ArbitResult  ArbitResult;
+      struct st_GCP_TakeoverStarted  GCP_TakeoverStarted;
+      struct st_GCP_TakeoverCompleted  GCP_TakeoverCompleted;
+      struct st_LCP_TakeoverStarted  LCP_TakeoverStarted;
+      struct st_LCP_TakeoverCompleted  LCP_TakeoverCompleted;
 
       /* STATISTIC */
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned trans_count;
-	unsigned commit_count;
-	unsigned read_count;
-	unsigned simple_read_count;
-	unsigned write_count;
-	unsigned attrinfo_count;
-	unsigned conc_op_count;
-	unsigned abort_count;
-	unsigned scan_count;
-	unsigned range_scan_count;
-      } TransReportCounters;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned ops;
-      } OperationReportCounters;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned table_id;
-      } TableCreated;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned mean_loop_count;
-      } JobStatistic;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned to_node;
-	unsigned mean_sent_bytes;
-      } SendBytesStatistic;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned from_node;
-	unsigned mean_received_bytes;
-      } ReceiveBytesStatistic;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	int      gth;
-        /* union is for compatibility backward.
-         * page_size_kb member variable should be removed in the future
-        */
-        union {
-	  unsigned page_size_kb;
-          unsigned page_size_bytes;
-        };
-	unsigned pages_used;
-	unsigned pages_total;
-	unsigned block;
-      } MemoryUsage;
+      struct st_TransReportCounters  TransReportCounters;
+      struct st_OperationReportCounters  OperationReportCounters;
+      struct st_TableCreated  TableCreated;
+      struct st_JobStatistic  JobStatistic;
+      struct st_SendBytesStatistic  SendBytesStatistic;
+      struct st_ReceiveBytesStatistic  ReceiveBytesStatistic;
+      struct st_MemoryUsage  MemoryUsage;
 
       /* ERROR */
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned to_node;
-	unsigned code;
-      } TransporterError;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned to_node;
-	unsigned code;
-      } TransporterWarning;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned node;
-	unsigned count;
-      } MissedHeartbeat;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned node;
-      } DeadDueToHeartbeat;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	/* TODO */
-      } WarningEvent;
+      struct st_TransporterError  TransporterError;
+      struct st_TransporterWarning  TransporterWarning;
+      struct st_MissedHeartbeat  MissedHeartbeat;
+      struct st_DeadDueToHeartbeat  DeadDueToHeartbeat;
+      struct st_WarningEvent  WarningEvent;
 
       /* INFO */
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned node;
-      } SentHeartbeat;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned node;
-      } CreateLogBytes;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	/* TODO */
-      } InfoEvent;
-      /** Log event specific data for for corresponding NDB_LE_ log event */
-      struct {
-	unsigned usage;
-	unsigned alloc;
-	unsigned max;
-	unsigned apply_gci_l;
-	unsigned apply_gci_h;
-	unsigned latest_gci_l;
-	unsigned latest_gci_h;
-      } EventBufferStatus;
-
-      /** Log event data for @ref NDB_LE_BackupStarted */
-      struct {
-	unsigned starting_node;
-	unsigned backup_id;
-      } BackupStarted;
-      /** Log event data @ref NDB_LE_BackupFailedToStart */
-      struct {
-	unsigned starting_node;
-	unsigned error;
-      } BackupFailedToStart;
-      /** Log event data @ref NDB_LE_BackupCompleted */
-      struct {
-	unsigned starting_node;
-	unsigned backup_id; 
-	unsigned start_gci;
-	unsigned stop_gci;
-	unsigned n_records; 
-	unsigned n_log_records;
-	unsigned n_bytes;
-	unsigned n_log_bytes;
-	unsigned n_records_hi;
-	unsigned n_log_records_hi;
-	unsigned n_bytes_hi;
-	unsigned n_log_bytes_hi;
-      } BackupCompleted;
-      /** Log event data @ref NDB_LE_BackupStatus */
-      struct {
-	unsigned starting_node;
-	unsigned backup_id; 
-	unsigned n_records_lo; 
-	unsigned n_records_hi; 
-	unsigned n_log_records_lo;
-	unsigned n_log_records_hi;
-	unsigned n_bytes_lo;
-	unsigned n_bytes_hi;
-	unsigned n_log_bytes_lo;
-	unsigned n_log_bytes_hi;
-      } BackupStatus;
-      /** Log event data @ref NDB_LE_BackupAborted */
-      struct {
-	unsigned starting_node;
-	unsigned backup_id;
-	unsigned error;
-      } BackupAborted;
-      /** Log event data @ref NDB_LE_RestoreStarted */
-      struct {
-	unsigned backup_id;
-	unsigned node_id;
-      } RestoreStarted;
-      /** Log event data @ref NDB_LE_RestoreMetaData */
-      struct {
-	unsigned backup_id;
-	unsigned node_id;
-	unsigned n_tables;
-	unsigned n_tablespaces;
-	unsigned n_logfilegroups;
-	unsigned n_datafiles;
-	unsigned n_undofiles;
-      } RestoreMetaData;
-      /** Log event data @ref NDB_LE_RestoreData */
-      struct {
-	unsigned backup_id;
-	unsigned node_id;
-	unsigned n_records_lo;
-	unsigned n_records_hi;
-	unsigned n_bytes_lo;
-	unsigned n_bytes_hi;
-      } RestoreData;
-      /** Log event data @ref NDB_LE_RestoreLog */
-      struct {
-	unsigned backup_id;
-	unsigned node_id;
-	unsigned n_records_lo;
-	unsigned n_records_hi;
-	unsigned n_bytes_lo;
-	unsigned n_bytes_hi;
-      } RestoreLog;
-      /** Log event data @ref NDB_LE_RestoreCompleted */
-      struct {
-	unsigned backup_id;
-	unsigned node_id;
-      } RestoreCompleted;
-      /** Log event data @ref NDB_LE_SingleUser */
-      struct {
-        unsigned type;
-        unsigned node_id;
-      } SingleUser;
-      /** Log even data @ref NDB_LE_StartReport */
-      struct {
-	unsigned report_type;
-	unsigned remaining_time;
-	unsigned bitmask_size;
-	unsigned bitmask_data[1];
-      } StartReport;
-      /** Log event data @ref NDB_LE_SubscriptionStatus */
-      struct {
-        unsigned report_type;
-	unsigned node_id;
-      } SubscriptionStatus;
+      struct st_SentHeartbeat  SentHeartbeat;
+      struct st_CreateLogBytes  CreateLogBytes;
+      struct st_InfoEvent  InfoEvent;
+      struct st_EventBufferStatus  EventBufferStatus;
+      struct st_BackupStarted  BackupStarted;
+      struct st_BackupFailedToStart  BackupFailedToStart;
+      struct st_BackupCompleted  BackupCompleted;
+      struct st_BackupStatus  BackupStatus;
+      struct st_BackupAborted  BackupAborted;
+      struct st_RestoreStarted  RestoreStarted;
+      struct st_RestoreMetaData  RestoreMetaData;
+      struct st_RestoreData  RestoreData;
+      struct st_RestoreLog  RestoreLog;
+      struct st_RestoreCompleted  RestoreCompleted;
+      struct st_SingleUser  SingleUser;
+      struct st_StartReport  StartReport;
+      struct st_SubscriptionStatus  SubscriptionStatus;
 #ifndef DOXYGEN_FIX
     };
 #else