bk commit into 5.1 tree (knielsen:1.2389)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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, 2007-02-08 13:34:29+01:00, knielsen@stripped +2 -0
  Fix compile error.

  storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp@stripped, 2007-02-08 13:34:09+01:00, knielsen@stripped +2 -2
    Fix compile error.

  storage/ndb/include/ndbapi/NdbReceiver.hpp@stripped, 2007-02-08 13:34:00+01:00, knielsen@stripped +1 -1
    Fix compile error.

# 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:	knielsen
# Host:	bk-internal.mysql.com
# Root:	/data0/bk/knielsen/mysql-5.1-wl2223

--- 1.29/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2007-02-08 13:34:36 +01:00
+++ 1.30/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2007-02-08 13:34:36 +01:00
@@ -219,8 +219,8 @@
   int ordered_send_scan_wait_for_all(bool forceSend);
   int send_next_scan_ordered(Uint32 idx);
   int compare(Uint32 key, Uint32 cols, const NdbReceiver*, const NdbReceiver*);
-  int NdbIndexScanOperation::compare_ndbrecord(const NdbReceiver *r1,
-                                               const NdbReceiver *r2) const;
+  int compare_ndbrecord(const NdbReceiver *r1,
+                        const NdbReceiver *r2) const;
   Uint32 m_sort_columns;
   Uint32 m_this_bound_start;
   Uint32 * m_first_bound_word;

--- 1.20/storage/ndb/include/ndbapi/NdbReceiver.hpp	2007-02-08 13:34:36 +01:00
+++ 1.21/storage/ndb/include/ndbapi/NdbReceiver.hpp	2007-02-08 13:34:36 +01:00
@@ -179,7 +179,7 @@
   */
   const char *peek_row() const;
   /* get_range_no() returns the range_no from the last returned row. */
-  int NdbReceiver::get_range_no() const;
+  int get_range_no() const;
   /* get_keyinfo20)_ returns keyinfo from KEYINFO20 signal. */
   int get_keyinfo20(Uint32 & scaninfo, Uint32 & length,
                     const char * & data_ptr) const;