bk commit into 5.1 tree (jon:1.2131)

[jon]

Below is the list of changes that have just been committed into a local
5.1 repository of jon. When jon 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.2131 06/02/03 22:03:34 jon@stripped +2 -0
  Merge jstephens@stripped:/home/bk/mysql-5.1-new
  into  gigan.homedns.org:/home/jon/bk/mysql-5.1-ndbapi-master

  storage/ndb/include/ndbapi/NdbEventOperation.hpp
    1.20 06/02/03 22:03:27 jon@stripped +15 -11
    Manual merge.

  storage/ndb/include/ndbapi/NdbDictionary.hpp
    1.66 06/02/03 22:03:27 jon@stripped +6 -6
    Manual merge.

# 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:	jon
# Host:	gigan.site
# Root:	/home/jon/bk/mysql-5.1-ndbapi-master/RESYNC

--- 1.65/storage/ndb/include/ndbapi/NdbDictionary.hpp	2006-01-31 19:34:19 +10:00
+++ 1.66/storage/ndb/include/ndbapi/NdbDictionary.hpp	2006-02-03 22:03:27 +10:00
@@ -55,7 +55,6 @@
  *    objects.
  * -# NdbDictionary::Table - Used for creating tables.
  * -# NdbDictionary::Column - Used for creating table columns.
- * -# NdbDictionary::Index  - Used for creating secondary indexes.
  *
  * See @ref ndbapi_simple_index.cpp for details of usage.
  */
@@ -167,6 +166,7 @@
 
   class Table; // forward declaration
   class Tablespace; // forward declaration
+//  class NdbEventOperation; // forward declaration
 
   /**
    * @class Column
@@ -792,7 +792,7 @@
     void setTablespace(const char * name);
     void setTablespace(const class Tablespace &);
     const char * getTablespace() const;
-    Uint32 getTablespaceId() const;
+    bool getTablespace(Uint32 *id= 0, Uint32 *version= 0) const;
 
     /**
      * Gets the table object type.
@@ -895,6 +895,7 @@
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
     friend class NdbDictionaryImpl;
     friend class NdbTableImpl;
+    friend class NdbEventOperationImpl;
 #endif
     class NdbTableImpl & m_impl;
     Table(NdbTableImpl&);
@@ -1194,13 +1195,20 @@
      */
     const char *getName() const;
     /**
+     * Gets the table on which the event is defined.
+     *
+     * @return Pointer to the table, or <code>NULL</code> if no
+     *         table has been defined.
+     */
+    const NdbDictionary::Table * getTable() const;
+    /**
      * Defines the table on which events should be detected.
      *
      * @note This method defaults to detection of events on all columns. 
      *       This behaviour can be overridden by calling
      *       addEventColumn().
      *
-     * @param table Reference retrieved from NdbDictionary.
+     * @param Table reference retrieved from NdbDictionary.
      */
     void setTable(const NdbDictionary::Table& table);
     /**
@@ -1214,7 +1222,7 @@
     /**
      * Gets the table name for event handling.
      *
-     * @return table name
+     * @return Name of the table.
      */
     const char* getTableName() const;
     /**
@@ -1257,7 +1265,7 @@
      */
     void addEventColumn(const char * columnName);
     /**
-     * Adds multiple columns on which events should be detected
+     * Adds multiple columns on which events should be detected.
      *
      * @param n Number of columns
      * @param columnNames Column names
@@ -1752,6 +1760,7 @@
     int createTablespace(const Tablespace &);
     int dropTablespace(const Tablespace&);
     Tablespace getTablespace(const char * name);
+    Tablespace getTablespace(Uint32 tablespaceId);
 
     int createDatafile(const Datafile &, bool overwrite_existing = false);
     int dropDatafile(const Datafile&);

--- 1.19/storage/ndb/include/ndbapi/NdbEventOperation.hpp	2006-01-31 22:48:24 +10:00
+++ 1.20/storage/ndb/include/ndbapi/NdbEventOperation.hpp	2006-02-03 22:03:27 +10:00
@@ -27,7 +27,7 @@
  * Brief description - how to work with events:
  *
  * - An event, represented by an NdbDictionary::Event, is created in the 
- *   Database through NdbDictionary::Dictionary::createEvent().  
+ *   database using NdbDictionary::Dictionary::createEvent().  
  * - To listen to events, an NdbEventOperation object is instantiated by 
  *   Ndb::createEventOperation()
  * - execute() starts the event flow. Use Ndb::pollEvents() to wait
@@ -40,7 +40,7 @@
  *
  * For more information see @ref ndbapi_event.cpp.
  *
- * Known limitations:
+ * <b>Known limitations</b>:
  *
  * - The total maximum number of active NdbEventOperation instances is 
  *   currently set at compile time to 100. This is expected eventually 
@@ -48,9 +48,9 @@
  * - The maximum number of NdbEventOperations tied to the same event is 
  *   16 per process.
  *
- * Known issues:
+ * <b>Known issues</b>:
  *
- * - When several NdbEventOperation objects are tied to the same event 
+ * - When several instances of NdbEventOperation are tied to the same event 
  *   and the same process, they share the circular buffer. The 
  *   BufferLength is then the same for all of them and determined by the 
  *   first NdbEventOperation to be instantiated. For this reason, you 
@@ -72,11 +72,11 @@
  *   NdbEventOperation() and re-create it. We intend to fix this issue 
  *   in a future version.
  *
- * Test status:
+ * <b>Test status</b>:
  *
  * - Tests have been run on 1-node and 2-node systems.
  *
- * Useful API programs:
+ * <b>Useful API programs</b>:
  *
  * - <code>ndb_select_all -d sys 'NDB$EVENTS_0'</code> shows the 
  *   contents of the system table holding created events.
@@ -184,7 +184,31 @@
   NdbDictionary::Event::TableEvent getEventType() const;
 
   /**
-   * Retrieves the GCI of the most recent event retrieved.
+   * Determines whether the table name has changed (<code>TE_ALTER</code> 
+   * event).
+   */
+  const bool tableNameChanged() const;
+
+  /**
+   * Determines whether the table's <code>.frm</code> file has changed 
+   * (<code>TE_ALTER</code> event).
+   */
+  const bool tableFrmChanged() const;
+
+  /**
+   * Determines whether the table fragmentation has changed 
+   * (<code>TE_ALTER</code> event).
+   */
+  const bool tableFragmentationChanged() const;
+
+  /**
+   * Determines whther the table's range partition list name has changed 
+   * (<code>TE_ALTER</code> event).
+   */
+  const bool tableRangeListChanged() const;
+
+  /**
+   * Retrieve the GCI of the latest retrieved event
    *
    * @return GCI number.
    */
@@ -207,14 +231,13 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
   /** these are subject to change at any time */
-  const NdbDictionary::Table *getTable() const;
   const NdbDictionary::Event *getEvent() const;
   const NdbRecAttr *getFirstPkAttr() const;
   const NdbRecAttr *getFirstPkPreAttr() const;
   const NdbRecAttr *getFirstDataAttr() const;
   const NdbRecAttr *getFirstDataPreAttr() const;
 
-  bool validateTable(NdbDictionary::Table &table) const;
+//  bool validateTable(NdbDictionary::Table &table) const;
 
   void setCustomData(void * data);
   void * getCustomData() const;