bk commit into 5.1 tree (tomas:1.2582) 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-28 07:42:43+02:00, tomas@stripped +2 -0
  Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue

  mysql-test/suite/rpl_ndb/t/disabled.def@stripped, 2007-08-28 07:42:40+02:00,
tomas@stripped +1 -1
    Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length
issue

  sql/field.cc@stripped, 2007-08-28 07:42:40+02:00, tomas@stripped +6 -9
    Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length
issue
    - correct previous patch

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-27 15:40:47 +02:00
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2007-08-28 07:42:40 +02:00
@@ -17,7 +17,7 @@ rpl_ndb_dd_partitions    : BUG#19259 200
 #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-27 15:41:20 +02:00
+++ b/sql/field.cc	2007-08-28 07:42:40 +02:00
@@ -7616,19 +7616,16 @@ uchar *Field_blob::pack(uchar *to, const
   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)
+  else if (!table->s->db_low_byte_first)
   {
-    store_length(to,packlength,length,0);
+    store_length(to,packlength,length,TRUE);
   }
-  else
 #endif
+  else
     memcpy(to,from,packlength);			// Copy length
   if (length)
   {
@@ -7667,9 +7664,9 @@ const uchar *Field_blob::unpack(uchar *t
 {
   uint32 length=get_length(from);
 #ifdef WORDS_BIGENDIAN
-  if (table->s->db_low_byte_first)
+  if (!table->s->db_low_byte_first)
   {
-    store_length(to,packlength,length,1);
+    store_length(to,packlength,length,FALSE);
   }
   else
 #endif