merge with 4.1

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
Docs/Support/texi2html:
  Auto merged
Makefile.am:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/my_time.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/include/ps_modify.inc:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/insert.test:
  merge with 4.1
  Fixed test case to not use 'if exists' when it shouldn't
mysql-test/t/range.test:
  merge with 4.1
  Added missing drop table
sql/ha_ndbcluster.cc:
  merge with 4.1
  Simple optimization: use max() instead of ? :
sql/item_func.cc:
  merge with 4.1
  (Added back old variable names for easier merges)
sql/opt_range.cc:
  merge with 4.1
  Removed argument 'parent_alloc' from QUICK_RANGE_SELECT as this was not used
  Added assert if using QUICK_GROUP_MIN_MAX_SELECT with parent_alloc as the init() function can't handle this
  Changed back get_quick_select_for_ref() to use it's own alloc root becasue this function may be called several times for one query
sql/sql_handler.cc:
  merge with 4.1
  change variable 'err' to 'error' as same function had a label named 'err'
sql/sql_update.cc:
  Use multi-update code from 5.0 instead of 4.1
  We will fix the locking code shortly in 5.0 to be faster than in 4.1

7 files changed, 32 insertions, 22 deletions

diff --git a/ndb/test/include/HugoOperations.hpp b/ndb/test/include/HugoOperations.hpp
index 6bd8f7204b2..fe22e4b5649 100644
--- a/ndb/test/include/HugoOperations.hpp
+++ b/ndb/test/include/HugoOperations.hpp
@@ -38,16 +38,8 @@ public:
   
   int pkReadRecord(Ndb*,
 		   int recordNo,
-		   bool exclusive = false,
-		   int numRecords = 1);
-  
-  int pkSimpleReadRecord(Ndb*,
-			 int recordNo,
-			 int numRecords = 1);
-  
-  int pkDirtyReadRecord(Ndb*,
-			int recordNo,
-			int numRecords = 1);
+		   int numRecords = 1,
+		   NdbOperation::LockMode lm = NdbOperation::LM_Read);
   
   int pkUpdateRecord(Ndb*,
 		     int recordNo,
diff --git a/ndb/test/include/HugoTransactions.hpp b/ndb/test/include/HugoTransactions.hpp
index 280d9490f15..19e4cb43336 100644
--- a/ndb/test/include/HugoTransactions.hpp
+++ b/ndb/test/include/HugoTransactions.hpp
@@ -48,8 +48,8 @@ public:
   int pkReadRecords(Ndb*, 
 		    int records,
 		    int batchsize = 1,
-		    bool dirty = false);
-
+		    NdbOperation::LockMode = NdbOperation::LM_Read);
+  
   int scanUpdateRecords(Ndb*, 
 			int records,
 			int abort = 0,
diff --git a/ndb/test/include/NDBT_ResultRow.hpp b/ndb/test/include/NDBT_ResultRow.hpp
index aa54e892da3..6072d0ea510 100644
--- a/ndb/test/include/NDBT_ResultRow.hpp
+++ b/ndb/test/include/NDBT_ResultRow.hpp
@@ -24,8 +24,9 @@ public:
   NDBT_ResultRow(const NdbDictionary::Table &tab, char attrib_delimiter='\t');
   ~NDBT_ResultRow();
   NdbRecAttr * & attributeStore(int i);
-  const NdbRecAttr * attributeStore(const char* name);
-
+  const NdbRecAttr * attributeStore(int i) const ;
+  const NdbRecAttr * attributeStore(const char* name) const ;
+  
   BaseString c_str();
 
   NdbOut & header (NdbOut &) const;
diff --git a/ndb/test/include/NDBT_Table.hpp b/ndb/test/include/NDBT_Table.hpp
index 59db3ed1092..d2f99b85187 100644
--- a/ndb/test/include/NDBT_Table.hpp
+++ b/ndb/test/include/NDBT_Table.hpp
@@ -33,10 +33,10 @@ public:
   {
     assert(_name != 0);
     
+    setType(_type);
+    setLength(_length);
     setNullable(_nullable);
     setPrimaryKey(_pk);
-    setLength(_length);
-    setType(_type);
   }
 };
 
diff --git a/ndb/test/include/NDBT_Test.hpp b/ndb/test/include/NDBT_Test.hpp
index 6a968c491ae..b0b5fe15960 100644
--- a/ndb/test/include/NDBT_Test.hpp
+++ b/ndb/test/include/NDBT_Test.hpp
@@ -82,6 +82,12 @@ public:
    */
   int getNoOfRunningSteps() const ;
   int getNoOfCompletedSteps() const ;
+
+  /**
+   * Thread sync
+   */
+  void sync_down(const char * key);
+  void sync_up_and_wait(const char * key, Uint32 count = 0);
 private:
   friend class NDBT_Step;
   friend class NDBT_TestSuite;
@@ -245,7 +251,7 @@ public:
       // Convert to Uint32 in order to be able to print it to screen
     Uint32 lapTime = (Uint32)m_ticks;
     Uint32 secTime = lapTime/1000;
-    snprintf(buf, 255, "%d secs (%d ms)", secTime, lapTime);
+    BaseString::snprintf(buf, 255, "%d secs (%d ms)", secTime, lapTime);
     return buf;
   }
 private:
diff --git a/ndb/test/include/NdbBackup.hpp b/ndb/test/include/NdbBackup.hpp
index 0a372eca7df..e2e672b8a72 100644
--- a/ndb/test/include/NdbBackup.hpp
+++ b/ndb/test/include/NdbBackup.hpp
@@ -47,7 +47,7 @@ private:
 		  int _node_id,
 		  unsigned _backup_id);
 
-  const char * getFileSystemPathForNode(int _node_id);
+  const char * getBackupDataDirForNode(int _node_id);
   
 };
 
diff --git a/ndb/test/include/UtilTransactions.hpp b/ndb/test/include/UtilTransactions.hpp
index 1298028d591..37cd99550a5 100644
--- a/ndb/test/include/UtilTransactions.hpp
+++ b/ndb/test/include/UtilTransactions.hpp
@@ -87,19 +87,30 @@ private:
 
 
   int verifyUniqueIndex(Ndb*,
-			const char* indexName,
+			const NdbDictionary::Index *,
 			int parallelism = 0,
 			bool transactional = false);
-  
+
   int scanAndCompareUniqueIndex(Ndb* pNdb,
-				const char * indexName,
+				const NdbDictionary::Index *,
 				int parallelism,
 				bool transactional);
   
   int readRowFromTableAndIndex(Ndb* pNdb,
 			       NdbConnection* pTrans,
-			       const char * indexName,
+			       const NdbDictionary::Index *,
 			       NDBT_ResultRow& row );
+
+  int verifyOrderedIndex(Ndb*,
+			 const NdbDictionary::Index *,
+			 int parallelism = 0,
+			 bool transactional = false);
+  
+
+  int get_values(NdbOperation* op, NDBT_ResultRow& dst);
+  int equal(const NdbDictionary::Table*, NdbOperation*, const NDBT_ResultRow&);
+  int equal(const NdbDictionary::Index*, NdbOperation*, const NDBT_ResultRow&);
+
 protected:
   int m_defaultClearMethod;
   const NdbDictionary::Table& tab;