bk commit into 5.1 tree (tomas:1.1971)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1971 06/01/18 16:19:19 tomas@stripped[tomas] +5 -0
  updated version
  added 2 get primitive to NdbDictionaryEvent

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.38 06/01/18 16:19:12 tomas@stripped[tomas] +1 -0
    added 2 get primitive to NdbDictionaryEvent

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.94 06/01/18 16:19:12 tomas@stripped[tomas] +6 -0
    added 2 get primitive to NdbDictionaryEvent

  storage/ndb/src/ndbapi/NdbDictionary.cpp
    1.42 06/01/18 16:19:12 tomas@stripped[tomas] +29 -0
    added 2 get primitive to NdbDictionaryEvent

  storage/ndb/include/ndbapi/NdbDictionary.hpp
    1.58 06/01/18 16:19:12 tomas@stripped[tomas] +9 -0
    added 2 get primitive to NdbDictionaryEvent

  configure.in
    1.304 06/01/18 16:19:12 tomas@stripped[tomas] +2 -2
    updated version

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325-alcatel

--- 1.303/configure.in	2005-11-16 11:25:21 +01:00
+++ 1.304/configure.in	2006-01-18 16:19:12 +01:00
@@ -7,7 +7,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # Don't forget to also update the NDB lines below.
-AM_INIT_AUTOMAKE(mysql, 5.1.2-a_drop5p6)
+AM_INIT_AUTOMAKE(mysql, 5.1.2-a_drop5p7)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=1
 NDB_VERSION_BUILD=2
-NDB_VERSION_STATUS="a_drop5p6"
+NDB_VERSION_STATUS="a_drop5p7"
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4

--- 1.57/storage/ndb/include/ndbapi/NdbDictionary.hpp	2005-09-15 12:30:48 +02:00
+++ 1.58/storage/ndb/include/ndbapi/NdbDictionary.hpp	2006-01-18 16:19:12 +01:00
@@ -1055,6 +1055,10 @@
      */
     void addTableEvent(const TableEvent te);
     /**
+     * Check if a specific table event will be detected
+     */
+    bool getTableEvent(const TableEvent te) const;
+    /**
      * Set durability of the event
      */
     void setDurability(EventDurability);
@@ -1098,6 +1102,11 @@
      * @return Number of columns, -1 on error
      */
     int getNoOfEventColumns() const;
+
+    /**
+     * Get a specific column in the event
+     */
+    const Column * getEventColumn(unsigned no) const;
 
     /**
      * Get object status

--- 1.41/storage/ndb/src/ndbapi/NdbDictionary.cpp	2005-09-15 12:30:51 +02:00
+++ 1.42/storage/ndb/src/ndbapi/NdbDictionary.cpp	2006-01-18 16:19:12 +01:00
@@ -672,6 +672,12 @@
   m_impl.addTableEvent(t);
 }
 
+bool
+NdbDictionary::Event::getTableEvent(const TableEvent t) const
+{
+  return m_impl.getTableEvent(t);
+}
+
 void
 NdbDictionary::Event::setDurability(EventDurability d)
 {
@@ -714,6 +720,29 @@
 int NdbDictionary::Event::getNoOfEventColumns() const
 {
   return m_impl.getNoOfEventColumns();
+}
+
+const NdbDictionary::Column *
+NdbDictionary::Event::getEventColumn(unsigned no) const
+{
+  if (m_impl.m_columns.size())
+  {
+    if (no < m_impl.m_columns.size())
+    {
+      return m_impl.m_columns[no];
+    }
+  }
+  else if (m_impl.m_attrIds.size())
+  {
+    if (no < m_impl.m_attrIds.size())
+    {
+      NdbTableImpl* tab= m_impl.m_tableImpl;
+      if (tab == 0)
+        return 0;
+      return tab->getColumn(m_impl.m_attrIds[no]);
+    }
+  }
+  return 0;
 }
 
 NdbDictionary::Object::Status

--- 1.93/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-09-15 12:30:51 +02:00
+++ 1.94/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-01-18 16:19:12 +01:00
@@ -687,6 +687,12 @@
   mi_type |= (unsigned)t;
 }
 
+bool
+NdbEventImpl::getTableEvent(const NdbDictionary::Event::TableEvent t) const
+{
+  return (mi_type & (unsigned)t) == (unsigned)t;
+}
+
 void
 NdbEventImpl::setDurability(NdbDictionary::Event::EventDurability d)
 {

--- 1.37/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2005-09-15 12:30:51 +02:00
+++ 1.38/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-01-18 16:19:12 +01:00
@@ -219,6 +219,7 @@
   void setTable(const char * table);
   const char * getTableName() const;
   void addTableEvent(const NdbDictionary::Event::TableEvent t);
+  bool getTableEvent(const NdbDictionary::Event::TableEvent t) const;
   void setDurability(NdbDictionary::Event::EventDurability d);
   NdbDictionary::Event::EventDurability  getDurability() const;
   void addEventColumn(const NdbColumnImpl &c);