From: Date: April 21 2006 3:36pm
Subject: bk commit into 5.1 tree (tomas:1.2348) BUG#19255
List-Archive: http://lists.mysql.com/commits/5291
X-Bug: 19255
Message-Id: <20060421133625.350C71F3086@poseidon.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2348 06/04/21 15:36:10 tomas@stripped +2 -0
  Bug #19255 ndb: restore of ndb backup from different endian does not work
  + removed not needed --

  storage/ndb/tools/restore/Restore.cpp
    1.39 06/04/21 15:35:57 tomas@stripped +3 -1
    Bug #19255 ndb: restore of ndb backup from different endian does not work
    + removed not needed --

  mysql-test/mysql-test-run.pl
    1.108 06/04/21 15:35:57 tomas@stripped +1 -1
    post merge fix

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.107/mysql-test/mysql-test-run.pl	2006-04-21 14:00:38 +02:00
+++ 1.108/mysql-test/mysql-test-run.pl	2006-04-21 15:35:57 +02:00
@@ -1524,7 +1524,7 @@
   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", "", "") )

--- 1.38/storage/ndb/tools/restore/Restore.cpp	2006-04-21 11:26:15 +02:00
+++ 1.39/storage/ndb/tools/restore/Restore.cpp	2006-04-21 15:35:57 +02:00
@@ -1021,7 +1021,6 @@
     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);
@@ -1056,6 +1055,9 @@
       res = -1;
       return 0;
     }
+
+    if(unlikely(!m_hostByteOrder))
+      *(Uint32*)ah = Twiddle32(*(Uint32*)ah);
 
     attr->Desc = (* tab)[ah->getAttributeId()];
     assert(attr->Desc != 0);