Bug #19255 ndb: restore of ndb backup from different endian does not work

+ removed not needed --


mysql-test/mysql-test-run.pl:
  post merge fix

mysql-test/mysql-test-run.pl

@@ -1524,7 +1524,7 @@ sub ndbcluster_start ($) {
   if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
 	       ["--port=$opt_ndbcluster_port",
 		"--data-dir=$opt_vardir",
-	        "--character-sets-dir=$path_charsetsdir"],
+	        "--character-sets-dir=$path_charsetsdir",
 		"--verbose=2",
 	        "--core"],
 	       "", "/dev/null", "", "") )

storage/ndb/tools/restore/Restore.cpp

@@ -1021,7 +1021,6 @@ RestoreLogIterator::getNextLogEntry(int & res) {
     if(hasGcp){
       // last attr_data is gci info
       attr_data_len--;
-      len--;
       m_last_gci = ntohl(*(attr_data + attr_data_len));
     }
   } while(m_last_gci > stopGCP + 1);
@@ -1057,6 +1056,9 @@ RestoreLogIterator::getNextLogEntry(int & res) {
       return 0;
     }
 
+    if(unlikely(!m_hostByteOrder))
+      *(Uint32*)ah = Twiddle32(*(Uint32*)ah);
+
     attr->Desc = (* tab)[ah->getAttributeId()];
     assert(attr->Desc != 0);