bk commit into 5.1 tree (joreland:1.1868)

[jonas.oreland]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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
  1.1868 05/07/26 15:05:05 joreland@stripped +4 -0
  ndb -
    fix length of NDB$PK in unique index table

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.85 05/07/26 15:05:00 joreland@stripped +2 -2
    fix length of NDB$PK in index table

  sql/ha_ndbcluster.h
    1.91 05/07/26 15:05:00 joreland@stripped +1 -1
    fix g++ compile error

  sql/ha_innodb.h
    1.101 05/07/26 15:05:00 joreland@stripped +1 -1
    fix g++ compile error

  storage/ndb/tools/config.cpp
    1.2 05/07/26 11:42:38 joreland@stripped +0 -0
    Rename: ndb/tools/config.cpp -> storage/ndb/tools/config.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:	joreland
# Host:	eel.(none)
# Root:	/home/jonas/src/mysql-5.1-push

--- 1.84/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-07-20 14:48:32 +02:00
+++ 1.85/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-07-26 15:05:00 +02:00
@@ -12549,7 +12549,7 @@
   AttributeBuffer::DataBufferIterator iter;
   Uint32 attrId = 0;
   Uint32 keyLength = 0;
-  Uint32 totalPrimaryKeyLength = 0;
+  Uint32 totalPrimaryKeyLength = 1; // fragment length
   Uint32 hops;
 
   indexTabPtr.i = indexData->indexId;
@@ -12604,7 +12604,7 @@
   }
   AttributeHeader pkAttrHeader(attrId, totalPrimaryKeyLength);
   Uint32 attributesLength = afterValues.getSize() + 
-    pkAttrHeader.getHeaderSize() + pkAttrHeader.getDataSize() + 1;
+    pkAttrHeader.getHeaderSize() + pkAttrHeader.getDataSize();
   
   TcKeyReq::setKeyLength(tcKeyRequestInfo, keyLength);
   tcKeyReq->attrLen = attributesLength;

--- 1.90/sql/ha_ndbcluster.h	2005-07-22 22:47:35 +02:00
+++ 1.91/sql/ha_ndbcluster.h	2005-07-26 15:05:00 +02:00
@@ -541,7 +541,7 @@
                                      qc_engine_callback *engine_callback,
                                      ulonglong *engine_data);
 
-  bool ha_ndbcluster::check_if_incompatible_data(HA_CREATE_INFO *info,
+  bool check_if_incompatible_data(HA_CREATE_INFO *info,
 						 uint table_changes);
 
 private:

--- 1.100/sql/ha_innodb.h	2005-07-22 22:47:35 +02:00
+++ 1.101/sql/ha_innodb.h	2005-07-26 15:05:00 +02:00
@@ -202,7 +202,7 @@
         static ulonglong get_mysql_bin_log_pos();
         bool primary_key_is_clustered() { return true; }
         int cmp_ref(const byte *ref1, const byte *ref2);
-	bool ha_innobase::check_if_incompatible_data(HA_CREATE_INFO *info,
+	bool check_if_incompatible_data(HA_CREATE_INFO *info,
 						     uint table_changes);
 };