bk commit into 5.1 tree (jonas:1.2722)

[jonas]

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@stripped, 2008-02-22 11:29:33+01:00, jonas@stripped +3 -0
  6.3.6 to backup merge

  storage/ndb/src/kernel/blocks/backup/Backup.cpp@stripped, 2008-02-22 11:29:31+01:00, jonas@stripped +2 -3
    fix merge

  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@stripped, 2008-02-22 11:29:31+01:00, jonas@stripped +1 -0
    fix dynamic primary keys

  storage/ndb/tools/Makefile.am@stripped, 2008-02-22 11:29:31+01:00, jonas@stripped +1 -1
    remove ndb_restore (for now) as it's utterly broken in this clone

diff -Nrup a/storage/ndb/src/kernel/blocks/backup/Backup.cpp b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
--- a/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2007-06-26 22:41:16 +02:00
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2008-02-22 11:29:31 +01:00
@@ -3226,7 +3226,6 @@ Backup::execGET_TABINFO_CONF(Signal* sig
     EXECUTE_DIRECT(DBDICT, GSN_BACKUP_FRAGMENT_REQ, signal, 2);
   }
 
-  TablePtr save = tabPtr;
   ptr.p->tables.next(tabPtr);
   
 next:
@@ -3305,7 +3304,7 @@ Backup::parseTableDescription(Signal* si
   tabPtr.p->triggerAllocated[2] = false;
 
   tabPtr.p->noOfAttributes = tmpTab.NoOfAttributes;
-  tabPtr.p->maxRecordSize = 1;
+  tabPtr.p->maxRecordSize = 1; // LEN word
   bzero(tabPtr.p->attrInfo, sizeof(tabPtr.p->attrInfo));
 
   Uint32 *list = tabPtr.p->attrInfo + 1;
@@ -3372,7 +3371,7 @@ Backup::parseTableDescription(Signal* si
   else
   {
     // mask
-    tabPtr.p->maxRecordSize += 1 + (tmpTab.NoOfAttributes + 31) >> 5;
+    tabPtr.p->maxRecordSize += 1 + ((tmpTab.NoOfAttributes + 31) >> 5);
     tabPtr.p->maxRecordSize += (2 * varsize + 3) / 4;
   }
 
diff -Nrup a/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2008-02-21 15:01:16 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2008-02-22 11:29:31 +01:00
@@ -2902,6 +2902,7 @@ Dbtup::read_lcp_keys(Uint32 tableId,
   KeyReqStruct req_struct;
   req_struct.m_tuple_ptr = ptr;
   req_struct.check_offset[MM]= len;
+  req_struct.is_expanded = false;
 
   /**
    * prepare_read...
diff -Nrup a/storage/ndb/tools/Makefile.am b/storage/ndb/tools/Makefile.am
--- a/storage/ndb/tools/Makefile.am	2007-04-24 22:43:08 +02:00
+++ b/storage/ndb/tools/Makefile.am	2008-02-22 11:29:31 +01:00
@@ -26,7 +26,7 @@ ndbtools_PROGRAMS = \
   ndb_show_tables \
   ndb_select_all \
   ndb_select_count \
-  ndb_restore ndb_config
+  ndb_config
 
 tools_common_sources = ../test/src/NDBT_ReturnCodes.cpp \
                        ../test/src/NDBT_Table.cpp \