bk commit into 5.1 tree (tomas:1.2075)

[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.2075 06/02/07 10:26:32 tomas@stripped +3 -0
   MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.48 06/02/07 10:26:23 tomas@stripped +1 -0
     MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.105 06/02/07 10:26:23 tomas@stripped +23 -0
     MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event

  storage/ndb/src/ndbapi/NdbDictionary.cpp
    1.51 06/02/07 10:26:23 tomas@stripped +1 -18
     MySQL Bugs: #16925: ndb, added additional getters on NdbDictionary::Event

# 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/mysql-5.1-new

--- 1.50/storage/ndb/src/ndbapi/NdbDictionary.cpp	2006-02-07 10:02:57 +01:00
+++ 1.51/storage/ndb/src/ndbapi/NdbDictionary.cpp	2006-02-07 10:26:23 +01:00
@@ -922,24 +922,7 @@
 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;
+  return m_impl.getEventColumn(no);
 }
 
 void NdbDictionary::Event::mergeEvents(bool flag)

--- 1.104/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-02-07 10:02:57 +01:00
+++ 1.105/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-02-07 10:26:23 +01:00
@@ -1178,6 +1178,29 @@
   return m_attrIds.size() + m_columns.size();
 }
 
+const NdbDictionary::Column *
+NdbEventImpl::getEventColumn(unsigned no) const
+{
+  if (m_columns.size())
+  {
+    if (no < m_columns.size())
+    {
+      return m_columns[no];
+    }
+  }
+  else if (m_attrIds.size())
+  {
+    if (no < m_attrIds.size())
+    {
+      NdbTableImpl* tab= m_tableImpl;
+      if (tab == 0)
+        return 0;
+      return tab->getColumn(m_attrIds[no]);
+    }
+  }
+  return 0;
+}
+
 /**
  * NdbDictionaryImpl
  */

--- 1.47/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-02-07 10:02:57 +01:00
+++ 1.48/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-02-07 10:26:23 +01:00
@@ -287,6 +287,7 @@
   void setReport(NdbDictionary::Event::EventReport r);
   NdbDictionary::Event::EventReport  getReport() const;
   int getNoOfEventColumns() const;
+  const NdbDictionary::Column * getEventColumn(unsigned no) const;
 
   void print() {
     ndbout_c("NdbEventImpl: id=%d, key=%d",