bk commit into 5.1 tree (cbell:1.2572)

[cbell]

Below is the list of changes that have just been committed into a local
5.1 repository of cbell. When cbell 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 11:30:50-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3228 (NDB) : RBR using different table defs on slave/master
  
  Patch for PB testing errors.

  sql/rpl_utility.h@stripped, 2007-07-28 11:30:47-04:00, cbell@mysql_cab_desk. +8 -2
    WL#3228 (NDB) : RBR using different table defs on slave/master
    
    This patch corrects a problem detected on 64-bit platforms with BIT and
    VARCHAR fields.

# 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.7/sql/rpl_utility.h	2007-07-28 11:31:05 -04:00
+++ 1.8/sql/rpl_utility.h	2007-07-28 11:31:05 -04:00
@@ -110,13 +110,19 @@
           break;
         }
         case MYSQL_TYPE_BIT:
+        {
+          short int x= field_metadata[index++]; 
+          x = x + (field_metadata[index++] << 8U);
+          m_field_metadata[i]= x;
+          break;
+        }
         case MYSQL_TYPE_VARCHAR:
         {
           /*
             These types store two bytes.
           */
-          short int *x= (short int *)&field_metadata[index];
-          m_field_metadata[i]= sint2korr(x);
+          uint16 *x= (uint16 *)&field_metadata[index];
+          m_field_metadata[i]= *x;
           index= index + sizeof(short int);
           break;
         }