bk commit into 5.1 tree (tomas:1.2589) BUG#29549

[tomas]

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@stripped, 2007-08-29 09:44:37+02:00, tomas@stripped +2 -0
  Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
  - reverting patch as there where unknows sideeffects that we do not have time to follow up on just now

  mysql-test/suite/rpl_ndb/t/disabled.def@stripped, 2007-08-29 09:44:34+02:00, tomas@stripped +3 -3
    Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
    - reverting patch as there where unknows sideeffects that we do not have time to follow up on just now

  sql/field.cc@stripped, 2007-08-29 09:44:34+02:00, tomas@stripped +2 -17
    Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
    - reverting patch as there where unknows sideeffects that we do not have time to follow up on just now

diff -Nrup a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2007-08-28 07:42:40 +02:00
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2007-08-29 09:44:34 +02:00
@@ -14,10 +14,10 @@
 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
 rpl_ndb_2myisam          : BUG#19227 Seems to pass currently
 rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD
-#rpl_ndb_innodb2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
-#rpl_ndb_myisam2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
+rpl_ndb_innodb2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
+rpl_ndb_myisam2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
 rpl_ndb_ddl              : BUG#28798 2007-05-31  lars  Valgrind failure in NDB
-#rpl_ndb_mix_innodb       : BUG#28123 rpl_ndb_mix_innodb.test casue slave to core on sol10-sparc-a
+rpl_ndb_mix_innodb       : BUG#28123 rpl_ndb_mix_innodb.test casue slave to core on sol10-sparc-a
 rpl_ndb_ctype_ucs2_def   : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset
 
 
diff -Nrup a/sql/field.cc b/sql/field.cc
--- a/sql/field.cc	2007-08-28 10:37:22 +02:00
+++ b/sql/field.cc	2007-08-29 09:44:34 +02:00
@@ -7619,12 +7619,6 @@ uchar *Field_blob::pack(uchar *to, const
     length=max_length;
     store_length(to,packlength,length,TRUE);
   }
-#ifdef WORDS_BIGENDIAN
-  else if (!table->s->db_low_byte_first)
-  {
-    store_length(to,packlength,length,TRUE);
-  }
-#endif
   else
     memcpy(to,from,packlength);			// Copy length
   if (length)
@@ -7662,17 +7656,8 @@ const uchar *Field_blob::unpack(uchar *t
 
 const uchar *Field_blob::unpack(uchar *to, const uchar *from)
 {
-  uint32 length=get_length(from,TRUE);
-#ifdef WORDS_BIGENDIAN
-  if (!table->s->db_low_byte_first)
-  {
-    store_length(to,packlength,length,FALSE);
-  }
-  else
-#endif
-  {
-    memcpy(to,from,packlength);
-  }
+  uint32 length=get_length(from);
+  memcpy(to,from,packlength);
   from+=packlength;
   if (length)
     memcpy_fixed(to+packlength, &from, sizeof(from));