Merge perch.ndb.mysql.com:/home/jonas/src/51-new

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

storage/ndb/tools/restore/Restore.cpp

@@ -515,7 +515,8 @@ RestoreDataIterator::getNextTuple(int  & res)
     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 @@ RestoreDataIterator::getNextTuple(int  & res)
 	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 @@ void TableS::createAttr(NdbDictionary::Column *column)
   }
 
   // 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++;