bk commit into 5.1 tree (stewart:1.2315)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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, 2006-11-08 15:23:46+11:00, stewart@willster.(none) +1 -0
  Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work
  into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
  MERGE: 1.1810.1698.154

  storage/ndb/include/util/Vector.hpp@stripped, 2006-11-08 15:23:42+11:00, stewart@willster.(none) +0 -0
    Auto merged
    MERGE: 1.4.1.2

  storage/ndb/include/util/Vector.hpp@stripped, 2006-11-08 15:23:41+11:00, stewart@willster.(none) +0 -0
    Merge rename: ndb/include/util/Vector.hpp -> storage/ndb/include/util/Vector.hpp

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb-mgm-work/RESYNC

--- 1.4.1.1/ndb/include/util/Vector.hpp	2006-11-03 23:56:23 +11:00
+++ 1.7/storage/ndb/include/util/Vector.hpp	2006-11-08 15:23:42 +11:00
@@ -31,6 +31,8 @@
   unsigned size() const { return m_size; };
   
   void push_back(const T &);
+  void push(const T&, unsigned pos);
+  T& set(T&, unsigned pos, T& fill_obj);
   T& back();
   
   void erase(unsigned index);
@@ -104,6 +106,31 @@
   }
   m_items[m_size] = t;
   m_size++;
+}
+
+template<class T>
+void
+Vector<T>::push(const T & t, unsigned pos)
+{
+  push_back(t);
+  if (pos < m_size - 1)
+  {
+    for(unsigned i = m_size - 1; i > pos; i--)
+    {
+      m_items[i] = m_items[i-1];
+    }
+    m_items[pos] = t;
+  }
+}
+
+template<class T>
+T&
+Vector<T>::set(T & t, unsigned pos, T& fill_obj)
+{
+  fill(pos, fill_obj);
+  T& ret = m_items[pos];
+  m_items[pos] = t;
+  return ret;
 }
 
 template<class T>