bk commit into 5.1 tree (tomas:1.2144)

[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@stripped, 2007-05-11 16:46:56+02:00, tomas@stripped +3 -0
  compile error corrections

  storage/ndb/test/include/NDBT_Table.hpp@stripped, 2007-05-11 16:46:54+02:00,
tomas@stripped +3 -1
    compile error corrections

  storage/ndb/test/ndbapi/test_event.cpp@stripped, 2007-05-11 16:46:54+02:00,
tomas@stripped +1 -1
    compile error corrections

  storage/ndb/test/src/NDBT_Table.cpp@stripped, 2007-05-11 16:46:54+02:00,
tomas@stripped +14 -2
    compile error corrections

# 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:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-5.0

--- 1.12/storage/ndb/test/include/NDBT_Table.hpp	2005-09-15 12:30:51 +02:00
+++ 1.13/storage/ndb/test/include/NDBT_Table.hpp	2007-05-11 16:46:54 +02:00
@@ -50,7 +50,8 @@
    * Print meta information about table 
    * (information on how it is strored, what the attributes look like etc.)
    */
-  friend class NdbOut& operator <<(class NdbOut&, const NDBT_Table &);
+  static class NdbOut &print_table(NdbOut &ndbout,
+                                   const NdbDictionary::Table &);
 public: 
   
   NDBT_Table(const char* name, 
@@ -81,6 +82,7 @@
  * (information on how it is strored, what the attributes look like etc.)
  */
 class NdbOut& operator <<(class NdbOut&, const NdbDictionary::Index &);
+class NdbOut& operator <<(class NdbOut&, const NdbDictionary::Table &);
 
 
 

--- 1.15/storage/ndb/test/ndbapi/test_event.cpp	2007-03-15 13:33:21 +01:00
+++ 1.16/storage/ndb/test/ndbapi/test_event.cpp	2007-05-11 16:46:54 +02:00
@@ -815,6 +815,7 @@
   int result = NDBT_OK;
   const NdbDictionary::Table * table= ctx->getTab();
   HugoTransactions hugoTrans(* table);
+  Ndb* ndb= GETNDB(step);
 
   char buf[1024];
   sprintf(buf, "%s_EVENT", table->getName());
@@ -843,7 +844,6 @@
     goto end;
   }
   
-  Ndb* ndb= GETNDB(step);
   while(!ctx->isTestStopped())
   {
     Uint64 curr_gci = 0;

--- 1.9/storage/ndb/test/src/NDBT_Table.cpp	2005-04-08 02:44:32 +02:00
+++ 1.10/storage/ndb/test/src/NDBT_Table.cpp	2007-05-11 16:46:54 +02:00
@@ -18,8 +18,8 @@
 #include <NdbTimer.hpp>
 #include <NDBT.hpp>
 
-class NdbOut& 
-operator <<(class NdbOut& ndbout, const NDBT_Table & tab)
+static
+class NdbOut &print_table(NdbOut &ndbout, const NdbDictionary::Table &tab)
 {
   ndbout << "-- " << tab.getName() << " --" << endl;
   
@@ -57,6 +57,18 @@
   }
   
   return ndbout;
+}
+
+class NdbOut& 
+operator <<(class NdbOut& ndbout, const NdbDictionary::Table & tab)
+{
+  return print_table(ndbout, tab);
+}
+
+class NdbOut& 
+operator <<(class NdbOut& ndbout, const NDBT_Table & tab)
+{
+  return print_table(ndbout, tab);
 }
 
 class NdbOut& operator <<(class NdbOut&, const NdbDictionary::Index &
idx)