Merge sita.local:/Users/tsmith/m/bk/maint/51-target22

into  sita.local:/Users/tsmith/m/bk/maint/51


sql/field.cc:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/rpl_record.h:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/slave.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
sql/log_event.cc:
  Manual merge
sql/log_event.h:
  Manual merge
sql/log_event_old.h:
  Manual merge
sql/rpl_record.cc:
  Manual merge
sql/slave.cc:
  Manual merge

1 files changed, 2 insertions, 20 deletions

diff --git a/sql/field.cc b/sql/field.cc
index 2c61f26ad6a..fa93454c757 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -7796,19 +7796,10 @@ uchar *Field_blob::pack(uchar *to, const uchar *from, uint max_length)
   uint32 length=get_length();			// Length of from string
   if (length > max_length)
   {
-    ptr=to;
     length=max_length;
-    store_length(length);			// Store max length
-    ptr= (uchar*) from;
+    store_length(to,packlength,length,TRUE);
   }
   else
-#ifdef WORDS_BIGENDIAN
-  if (table->s->db_low_byte_first)
-  {
-    store_length(to,packlength,length,0);
-  }
-  else
-#endif
     memcpy(to,from,packlength);			// Copy length
   if (length)
   {
@@ -7846,16 +7837,7 @@ const uchar *Field_blob::unpack(uchar *to,
 const uchar *Field_blob::unpack(uchar *to, const uchar *from)
 {
   uint32 length=get_length(from);
-#ifdef WORDS_BIGENDIAN
-  if (table->s->db_low_byte_first)
-  {
-    store_length(to,packlength,length,1);
-  }
-  else
-#endif
-  {
-    memcpy(to,from,packlength);
-  }
+  memcpy(to,from,packlength);
   from+=packlength;
   if (length)
     memcpy_fixed(to+packlength, &from, sizeof(from));