Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

5 files changed, 6 insertions, 237 deletions

diff --git a/ndb/include/Makefile.am b/ndb/include/Makefile.am
index 240101c2004..842f4daabee 100644
--- a/ndb/include/Makefile.am
+++ b/ndb/include/Makefile.am
@@ -15,7 +15,6 @@ ndbapi/NdbApi.hpp \
 ndbapi/NdbTransaction.hpp \
 ndbapi/NdbDictionary.hpp \
 ndbapi/NdbError.hpp \
-ndbapi/NdbEventOperation.hpp \
 ndbapi/NdbIndexOperation.hpp \
 ndbapi/NdbOperation.hpp \
 ndbapi/ndb_cluster_connection.hpp \
diff --git a/ndb/include/kernel/GlobalSignalNumbers.h b/ndb/include/kernel/GlobalSignalNumbers.h
index ca82806f4b1..ac8ac75dc41 100644
--- a/ndb/include/kernel/GlobalSignalNumbers.h
+++ b/ndb/include/kernel/GlobalSignalNumbers.h
@@ -731,9 +731,11 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES;
 #define GSN_SUB_CREATE_REQ              576
 #define GSN_SUB_CREATE_REF              577
 #define GSN_SUB_CREATE_CONF             578
+/*
 #define GSN_SUB_START_REQ               579
 #define GSN_SUB_START_REF               580
 #define GSN_SUB_START_CONF              581
+*/
 #define GSN_SUB_SYNC_REQ                582
 #define GSN_SUB_SYNC_REF                583
 #define GSN_SUB_SYNC_CONF               584
@@ -899,10 +901,11 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES;
 /**
  * SUMA restart protocol
  */
+/*
 #define GSN_SUMA_START_ME               691
 #define GSN_SUMA_HANDOVER_REQ           692
 #define GSN_SUMA_HANDOVER_CONF          693
-
+*/
 /* not used                             694 */
 /* not used                             695 */
 /* not used                             696 */
@@ -919,6 +922,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES;
 /*
  * EVENT Signals
  */
+/*
 #define GSN_SUB_GCP_COMPLETE_ACC        699
 
 #define GSN_CREATE_EVNT_REQ             700
@@ -928,7 +932,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES;
 #define GSN_DROP_EVNT_REQ               703
 #define GSN_DROP_EVNT_CONF              704
 #define GSN_DROP_EVNT_REF               705
-
+*/
 #define GSN_TUX_BOUND_INFO		710
 
 #define GSN_ACC_LOCKREQ			711
diff --git a/ndb/include/ndbapi/Ndb.hpp b/ndb/include/ndbapi/Ndb.hpp
index f128a45f5bf..e7c1e85c02a 100644
--- a/ndb/include/ndbapi/Ndb.hpp
+++ b/ndb/include/ndbapi/Ndb.hpp
@@ -38,9 +38,6 @@
    In addition, the NDB API defines a structure NdbError, which contains the 
    specification for an error.
 
-   It is also possible to receive "events" triggered when data in the database in changed.
-   This is done through the NdbEventOperation class.
-
    There are also some auxiliary classes, which are listed in the class hierarchy.
      
    The main structure of an application program is as follows:
@@ -968,7 +965,6 @@
 
 class NdbObjectIdMap;
 class NdbOperation;
-class NdbEventOperationImpl;
 class NdbScanOperation;
 class NdbIndexScanOperation;
 class NdbIndexOperation;
@@ -981,13 +977,11 @@ class NdbSubroutine;
 class NdbCall;
 class Table;
 class BaseString;
-class NdbEventOperation;
 class NdbBlob;
 class NdbReceiver;
 class Ndb_local_table_info;
 template <class T> struct Ndb_free_list_t;
 
-typedef void (* NdbEventCallback)(NdbEventOperation*, Ndb*, void*);
 
 #if defined NDB_OSE
 /**
@@ -1049,7 +1043,6 @@ class Ndb
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
   friend class NdbReceiver;
   friend class NdbOperation;
-  friend class NdbEventOperationImpl;
   friend class NdbTransaction;
   friend class Table;
   friend class NdbApiSignal;
@@ -1196,46 +1189,6 @@ public:
   /** @} *********************************************************************/
 
   /** 
-   * @name Event subscriptions
-   * @{
-   */
-
-  /**
-   * Create a subcription to an event defined in the database
-   *
-   * @param eventName
-   *        unique identifier of the event
-   * @param bufferLength
-   *        circular buffer size for storing event data
-   *
-   * @return Object representing an event, NULL on failure
-   */
-  NdbEventOperation* createEventOperation(const char* eventName,
-					  const int bufferLength);
-  /**
-   * Drop a subscription to an event
-   *
-   * @param eventOp
-   *        Event operation
-   *
-   * @return 0 on success
-   */
-  int dropEventOperation(NdbEventOperation* eventOp);
-
-  /**
-   * Wait for an event to occur. Will return as soon as an event
-   * is detected on any of the created events.
-   *
-   * @param aMillisecondNumber
-   *        maximum time to wait
-   *
-   * @return the number of events that has occured, -1 on failure
-   */
-  int pollEvents(int aMillisecondNumber);
-
-  /** @} *********************************************************************/
-
-  /** 
    * @name Starting and Closing Transactions
    * @{
    */
diff --git a/ndb/include/ndbapi/NdbApi.hpp b/ndb/include/ndbapi/NdbApi.hpp
index aed4d5efbd7..c8400ed78ce 100644
--- a/ndb/include/ndbapi/NdbApi.hpp
+++ b/ndb/include/ndbapi/NdbApi.hpp
@@ -29,7 +29,6 @@
 #include "NdbScanFilter.hpp"
 #include "NdbRecAttr.hpp"
 #include "NdbDictionary.hpp"
-#include "NdbEventOperation.hpp"
 #include "NdbPool.hpp"
 #include "NdbBlob.hpp"
 #endif
diff --git a/ndb/include/ndbapi/NdbDictionary.hpp b/ndb/include/ndbapi/NdbDictionary.hpp
index e67a0253096..db84c3715a5 100644
--- a/ndb/include/ndbapi/NdbDictionary.hpp
+++ b/ndb/include/ndbapi/NdbDictionary.hpp
@@ -938,165 +938,6 @@ public:
   };
 
   /**
-   * @brief Represents an Event in NDB Cluster
-   *
-   */
-  class Event : public Object  {
-  public:
-    /**
-     * Specifies the type of database operations an Event listens to
-     */
-#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
-    /** TableEvent must match 1 << TriggerEvent */
-#endif
-    enum TableEvent { 
-      TE_INSERT=1, ///< Insert event on table
-      TE_DELETE=2, ///< Delete event on table
-      TE_UPDATE=4, ///< Update event on table
-      TE_ALL=7     ///< Any/all event on table (not relevant when 
-                   ///< events are received)
-    };
-    /**
-     *  Specifies the durability of an event
-     * (future version may supply other types)
-     */
-    enum EventDurability { 
-      ED_UNDEFINED
-#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
-      = 0
-#endif
-#if 0 // not supported
-      ,ED_SESSION = 1, 
-      // Only this API can use it
-      // and it's deleted after api has disconnected or ndb has restarted
-      
-      ED_TEMPORARY = 2
-      // All API's can use it,
-      // But's its removed when ndb is restarted
-#endif
-      ,ED_PERMANENT    ///< All API's can use it.
-                       ///< It's still defined after a cluster system restart
-#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
-      = 3
-#endif
-    };
-
-    /**
-     *  Constructor
-     *  @param  name  Name of event
-     */
-    Event(const char *name);
-    /**
-     *  Constructor
-     *  @param  name  Name of event
-     *  @param  table Reference retrieved from NdbDictionary
-     */
-    Event(const char *name, const NdbDictionary::Table& table);
-    virtual ~Event();
-    /**
-     * Set unique identifier for the event
-     */
-    void setName(const char *name);
-    /**
-     * Get unique identifier for the event
-     */
-    const char *getName() const;
-    /**
-     * Define table on which events should be detected
-     *
-     * @note calling this method will default to detection
-     *       of events on all columns. Calling subsequent
-     *       addEventColumn calls will override this.
-     *
-     * @param table reference retrieved from NdbDictionary
-     */
-    void setTable(const NdbDictionary::Table& table);
-    /**
-     * Set table for which events should be detected
-     *
-     * @note preferred way is using setTable(const NdbDictionary::Table&)
-     *       or constructor with table object parameter
-     */
-    void setTable(const char *tableName);
-    /**
-     * Get table name for events
-     *
-     * @return table name
-     */
-    const char* getTableName() const;
-    /**
-     * Add type of event that should be detected
-     */
-    void addTableEvent(const TableEvent te);
-    /**
-     * Set durability of the event
-     */
-    void setDurability(EventDurability);
-    /**
-     * Get durability of the event
-     */
-    EventDurability getDurability() const;
-#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
-    void addColumn(const Column &c);
-#endif
-    /**
-     * Add a column on which events should be detected
-     *
-     * @param attrId Column id
-     *
-     * @note errors will mot be detected until createEvent() is called
-     */
-    void addEventColumn(unsigned attrId);
-    /**
-     * Add a column on which events should be detected
-     *
-     * @param columnName Column name
-     *
-     * @note errors will not be detected until createEvent() is called
-     */
-    void addEventColumn(const char * columnName);
-    /**
-     * Add several columns on which events should be detected
-     *
-     * @param n Number of columns
-     * @param columnNames Column names
-     *
-     * @note errors will mot be detected until 
-     *       NdbDictionary::Dictionary::createEvent() is called
-     */
-    void addEventColumns(int n, const char ** columnNames);
-
-    /**
-     * Get no of columns defined in an Event
-     *
-     * @return Number of columns, -1 on error
-     */
-    int getNoOfEventColumns() const;
-
-    /**
-     * Get object status
-     */
-    virtual Object::Status getObjectStatus() const;
-
-    /**
-     * Get object version
-     */
-    virtual int getObjectVersion() const;
-
-#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
-    void print();
-#endif
-
-  private:
-#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
-    friend class NdbEventImpl;
-    friend class NdbEventOperationImpl;
-#endif
-    class NdbEventImpl & m_impl;
-    Event(NdbEventImpl&);
-  };
-
-  /**
    * @class Dictionary
    * @brief Dictionary for defining and retreiving meta data
    */
@@ -1215,33 +1056,6 @@ public:
     int listIndexes(List & list, const char * tableName) const;
 
     /** @} *******************************************************************/
-    /** 
-     * @name Events
-     * @{
-     */
-    
-    /**
-     * Create event given defined Event instance
-     * @param event Event to create
-     * @return 0 if successful otherwise -1.
-     */
-    int createEvent(const Event &event);
-
-    /**
-     * Drop event with given name
-     * @param eventName  Name of event to drop.
-     * @return 0 if successful otherwise -1.
-     */
-    int dropEvent(const char * eventName);
-    
-    /**
-     * Get event with given name.
-     * @param eventName  Name of event to get.
-     * @return an Event if successful, otherwise NULL.
-     */
-    const Event * getEvent(const char * eventName);
-
-    /** @} *******************************************************************/
 
     /** 
      * @name Table creation