bk commit into 5.1 tree (cbell:1.2573)

[cbell]

Below is the list of changes that have just been committed into a local
5.1 repository of Chuck. When Chuck 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, 2007-07-28 18:46:21-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
    
  This patch changes the code to comply with different word order on Solaris

  sql/rpl_utility.h@stripped, 2007-07-28 18:46:18-04:00, cbell@mysql_cab_desk. +5 -1
    WL#3228 (NDB) : RBR using different table defs on slave/master
      
    This patch changes the code to comply with different word order on Solaris

# 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:	cbell
# Host:	mysql_cab_desk.
# Root:	C:/source/c++/mysql-5.1-new-ndb-push

--- 1.8/sql/rpl_utility.h	2007-07-28 18:46:37 -04:00
+++ 1.9/sql/rpl_utility.h	2007-07-28 18:46:37 -04:00
@@ -122,8 +122,12 @@
             These types store two bytes.
           */
           uint16 *x= (uint16 *)&field_metadata[index];
+#ifdef WORDS_BIGENDIAN
+          m_field_metadata[i]= sint2korr(x);
+#else
           m_field_metadata[i]= *x;
-          index= index + sizeof(short int);
+#endif
+          index= index + sizeof(short);
           break;
         }
         case MYSQL_TYPE_NEWDECIMAL: