bk commit into 5.1 tree (jonas:1.2099) BUG#17183

[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
  1.2099 06/02/14 11:48:15 jonas@stripped +1 -0
  bug#17183
    ndb_restore in 5.1.6 with files from < 5.1.3

  storage/ndb/tools/restore/Restore.cpp
    1.34 06/02/14 11:48:13 jonas@stripped +8 -2
    Fix backward compatible...

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-new

--- 1.33/storage/ndb/tools/restore/Restore.cpp	2006-01-17 09:24:54 +01:00
+++ 1.34/storage/ndb/tools/restore/Restore.cpp	2006-02-14 11:48:13 +01:00
@@ -515,7 +515,8 @@
     const AttributeDesc * attr_desc = m_tuple.getDesc(attrId);
     
     // just a reminder - remove when backwards compat implemented
-    if(false && attr_desc->m_column->getNullable()){
+    if(m_currentTable->backupVersion < MAKE_VERSION(5,1,3) && 
+       attr_desc->m_column->getNullable()){
       const Uint32 ind = attr_desc->m_nullBitIndex;
       if(BitmaskImpl::get(m_currentTable->m_nullBitmaskSize, 
 			  buf_ptr,ind)){
@@ -524,6 +525,11 @@
 	continue;
       }
     }
+
+    if (m_currentTable->backupVersion < MAKE_VERSION(5,1,3))
+    {
+      sz *= 4;
+    }
     
     attr_data->null = false;
     attr_data->void_value = &data->Data[0];
@@ -842,7 +848,7 @@
   }
 
   // just a reminder - does not solve backwards compat
-  if (backupVersion < MAKE_VERSION(5,1,0))
+  if (backupVersion < MAKE_VERSION(5,1,3))
   {
     d->m_nullBitIndex = m_noOfNullable; 
     m_noOfNullable++;