bk commit into 5.1 tree (df:1.2581)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.1 repository of df. When df 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-04-24 22:34:57+02:00, df@stripped +1 -0
  Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
  into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
  MERGE: 1.1810.2374.119

  storage/ndb/test/ndbapi/testScanFilter.cpp@stripped, 2007-04-24 22:34:54+02:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.1.1.2

  storage/ndb/test/ndbapi/testScanFilter.cpp@stripped, 2007-04-24 22:34:53+02:00, df@stripped +0 -0
    Merge rename: ndb/test/ndbapi/testScanFilter.cpp -> storage/ndb/test/ndbapi/testScanFilter.cpp

# 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:	df
# Host:	pippilotta.erinye.com
# Root:	/shared/home/df/mysql/build/mysql-5.1-build-work/RESYNC

--- 1.1.1.1/ndb/test/ndbapi/testScanFilter.cpp	2007-04-24 22:33:22 +02:00
+++ 1.5/storage/ndb/test/ndbapi/testScanFilter.cpp	2007-04-24 22:34:54 +02:00
@@ -96,7 +96,7 @@
   do{
     NdbDictionary::Table tmpTab(* tab);
     tmpTab.setStoredTable(_temp ? 0 : 1);
-    if(f != 0 && f(pNdb, tmpTab, 0))
+    if(f != 0 && f(pNdb, tmpTab, 0, NULL))
     {
       ndbout << "Failed to create table" << endl;
       return NDBT_FAILED;
@@ -764,18 +764,20 @@
 * str: a random string of scan opearation and condition
 * return: true stands for ndbapi ok, false stands for ndbapi failed
 */
+template class Vector<bool>;
 bool compare_cal_ndb(char *str, Ndb *ndb)
 {
-  bool res_cal[TUPLE_NUM], res_ndb[TUPLE_NUM];
+  Vector<bool> res_cal;
+  Vector<bool> res_ndb;
 
   for(int i = 0; i < TUPLE_NUM; i++)
   {
-    res_cal[i] = false;
-    res_ndb[i] = false;
+    res_cal.push_back(false);
+    res_ndb.push_back(false);
   }
 
-  check_all_tuples(str, res_cal);
-  ndbapi_tuples(ndb, str, res_ndb);
+  check_all_tuples(str, res_cal.getBase());
+  ndbapi_tuples(ndb, str, res_ndb.getBase());
 
   for(int i = 0; i < TUPLE_NUM; i++)
   {