From: Date: March 2 2007 4:03am
Subject: bk commit into 5.1 tree (Justin.He:1.2439) BUG#24568
List-Archive: http://lists.mysql.com/commits/21115
X-Bug: 24568
Message-Id: <200703020303.l2233Oc1016680@dev3-240.dev.cn.tlan>

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he 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-03-02 11:03:16+08:00, Justin.He@stripped +1 -0
  bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected
  when merge from 5.0 to 5.1, update a function call in testScanFilter.cpp 
  beacuase the function's definition is changed from 5.0 to 5.1

  storage/ndb/test/ndbapi/testScanFilter.cpp@stripped, 2007-03-02 11:03:14+08:00, Justin.He@stripped +1 -1
    bug#24568
    it need change f() call because NDBT_CreateTableHook definition is changed from 5.0 to 5.1

# 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:	Justin.He
# Host:	dev3-240.dev.cn.tlan
# Root:	/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj

--- 1.2/storage/ndb/test/ndbapi/testScanFilter.cpp	2007-03-02 11:03:24 +08:00
+++ 1.3/storage/ndb/test/ndbapi/testScanFilter.cpp	2007-03-02 11:03:24 +08:00
@@ -97,7 +97,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;