bk commit into 5.1 tree (Justin.He:1.2437)

[justin.he]

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-01 16:14:05+08:00, Justin.He@stripped +3 -0
  Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj
  into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj
  MERGE: 1.1810.2545.2

  storage/ndb/src/ndbapi/NdbScanFilter.cpp@stripped, 2007-03-01 16:13:51+08:00,
Justin.He@stripped +0 -0
    Auto merged
    MERGE: 1.8.4.2

  storage/ndb/src/ndbapi/NdbScanFilter.cpp@stripped, 2007-03-01 16:13:50+08:00,
Justin.He@stripped +0 -0
    Merge rename: ndb/src/ndbapi/NdbScanFilter.cpp ->
storage/ndb/src/ndbapi/NdbScanFilter.cpp

  storage/ndb/test/include/NDBT_Test.hpp@stripped, 2007-03-01 16:13:51+08:00,
Justin.He@stripped +0 -0
    Auto merged
    MERGE: 1.11.5.2

  storage/ndb/test/include/NDBT_Test.hpp@stripped, 2007-03-01 16:13:50+08:00,
Justin.He@stripped +0 -0
    Merge rename: ndb/test/include/NDBT_Test.hpp ->
storage/ndb/test/include/NDBT_Test.hpp

  storage/ndb/test/ndbapi/Makefile.am@stripped, 2007-03-01 16:13:51+08:00,
Justin.He@stripped +0 -0
    Auto merged
    MERGE: 1.19.12.2

  storage/ndb/test/ndbapi/Makefile.am@stripped, 2007-03-01 16:13:51+08:00,
Justin.He@stripped +0 -0
    Merge rename: ndb/test/ndbapi/Makefile.am -> storage/ndb/test/ndbapi/Makefile.am

# 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/RESYNC

--- 1.8.4.1/ndb/src/ndbapi/NdbScanFilter.cpp	2007-03-01 16:14:12 +08:00
+++ 1.12/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2007-03-01 16:14:12 +08:00
@@ -31,6 +31,7 @@
 
 class NdbScanFilterImpl {
 public:
+  NdbScanFilterImpl() {}
   struct State {
     NdbScanFilter::Group m_group;
     Uint32 m_popCount;

--- 1.11.5.1/ndb/test/include/NDBT_Test.hpp	2007-03-01 16:14:12 +08:00
+++ 1.20/storage/ndb/test/include/NDBT_Test.hpp	2007-03-01 16:14:12 +08:00
@@ -16,6 +16,7 @@
 #ifndef NDBT_TEST_HPP
 #define NDBT_TEST_HPP
 
+#include <ndb_global.h>
 
 #include "NDBT_ReturnCodes.h"
 #include <Properties.hpp>
@@ -39,6 +40,9 @@
   NDBT_Context(Ndb_cluster_connection&);
   ~NDBT_Context();
   const NdbDictionary::Table* getTab();
+  const NdbDictionary::Table** getTables();
+  int getNumTables() const;
+  const char * getTableName(int) const;
   NDBT_TestSuite* getSuite();
   NDBT_TestCase* getCase();
 
@@ -78,6 +82,7 @@
   bool setDbProperty(const char*, Uint32);
 
   void setTab(const NdbDictionary::Table*);
+  void addTab(const NdbDictionary::Table*);
   void setRemoteMgm(char * mgm);
 
   /**
@@ -101,7 +106,7 @@
   void setCase(NDBT_TestCase*);
   void setNumRecords(int);
   void setNumLoops(int);
-  const NdbDictionary::Table* tab;
+  Vector<const NdbDictionary::Table*> tables;
   NDBT_TestSuite* suite;
   NDBT_TestCase* testcase;
   Ndb* ndb;
@@ -217,6 +222,9 @@
   virtual int getNoOfRunningSteps() const = 0;
   virtual int getNoOfCompletedSteps() const = 0;
 
+  bool m_all_tables;
+  bool m_has_run;
+
 protected:
   virtual int runInit(NDBT_Context* ctx) = 0;
   virtual int runSteps(NDBT_Context* ctx) = 0;
@@ -336,6 +344,7 @@
   // to control the behaviour of the testsuite
   void setCreateTable(bool);     // Create table before test func is called
   void setCreateAllTables(bool); // Create all tables before testsuite is executed 
+  void setRunAllTables(bool); // Run once with all tables
 
   // Prints the testsuite, testcases and teststeps
   void printExecutionTree();
@@ -355,8 +364,14 @@
   // Returns true if timing info should be printed
   bool timerIsOn();
 
-
   int addTest(NDBT_TestCase* pTest);
+
+  // Table create tweaks
+  int createHook(Ndb*, NdbDictionary::Table&, int when);
+  Vector<BaseString> m_tables_in_test;
+
+  void setTemporaryTables(bool val);
+  bool getTemporaryTables() const;
 private:
   int executeOne(Ndb_cluster_connection&,
 		 const char* _tabname, const char* testname = NULL);
@@ -379,6 +394,11 @@
   int timer;
   NdbTimer testSuiteTimer;
   bool createTable;
+  bool diskbased;
+  bool runonce;
+  const char* tsname;
+  bool createAllTables;
+  bool temporaryTables;
 };
 
 
@@ -435,6 +455,10 @@
 // Means test will be run on all tables execept T10
 #define NOT_TABLE(tableName) \
   pt->addTable(tableName, false);
+
+// Text case will only be run once, not once per table as normally
+#define ALL_TABLES() \
+  pt->m_all_tables= true;
 
 #define NDBT_TESTSUITE_END(suitname) \
  } } ; C##suitname suitname

--- 1.19.12.1/ndb/test/ndbapi/Makefile.am	2007-03-01 16:14:12 +08:00
+++ 1.35/storage/ndb/test/ndbapi/Makefile.am	2007-03-01 16:14:12 +08:00
@@ -46,11 +46,13 @@
 testTimeout \
 testTransactions \
 testDeadlock \
-ndbapi_slow_select testReadPerf testLcp \
+test_event ndbapi_slow_select testReadPerf testLcp \
 testPartitioning \
 testBitfield \
 DbCreate DbAsyncGenerator \
-testSRBank
+testSRBank \
+test_event_merge \
+testIndexStat
 
 EXTRA_PROGRAMS = \
  test_event \
@@ -99,14 +101,15 @@
 testBitfield_SOURCES = testBitfield.cpp
 DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp
bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h
bench/ndb_schema.hpp bench/ndb_error.hpp
 DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp
bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h
bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
-test_event_multi_table_SOURCES = test_event_multi_table.cpp
 testSRBank_SOURCES = testSRBank.cpp
 test_event_merge_SOURCES = test_event_merge.cpp
+test_event_multi_table_SOURCES = test_event_multi_table.cpp
+testIndexStat_SOURCES = testIndexStat.cpp
 
-INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/kernel
 
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
 
 ##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
 ##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
@@ -124,62 +127,63 @@
              testScan.dsp
 
 flexBench.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ flexBench
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(flexBench_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ flexBench
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(flexBench_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
 
 testBasic.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ testBasic
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(testBasic_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ testBasic
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBasic_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
 
 testOIBasic.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ testOIBasic
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(testOIBasic_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ testOIBasic
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testOIBasic_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
 
 testBlobs.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ testBlobs
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(testBlobs_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ testBlobs
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBlobs_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
 
 testScan.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ testScan
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(testScan_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ testScan
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testScan_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+