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
parent 88b8ad10
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated 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_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_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_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_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_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 rpl_ndb_ctype_ucs2_def : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset
......
...@@ -7619,12 +7619,6 @@ uchar *Field_blob::pack(uchar *to, const uchar *from, uint max_length) ...@@ -7619,12 +7619,6 @@ uchar *Field_blob::pack(uchar *to, const uchar *from, uint max_length)
length=max_length; length=max_length;
store_length(to,packlength,length,TRUE); 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 else
memcpy(to,from,packlength); // Copy length memcpy(to,from,packlength); // Copy length
if (length) if (length)
...@@ -7662,17 +7656,8 @@ const uchar *Field_blob::unpack(uchar *to, ...@@ -7662,17 +7656,8 @@ const uchar *Field_blob::unpack(uchar *to,
const uchar *Field_blob::unpack(uchar *to, const uchar *from) const uchar *Field_blob::unpack(uchar *to, const uchar *from)
{ {
uint32 length=get_length(from,TRUE); uint32 length=get_length(from);
#ifdef WORDS_BIGENDIAN
if (!table->s->db_low_byte_first)
{
store_length(to,packlength,length,FALSE);
}
else
#endif
{
memcpy(to,from,packlength); memcpy(to,from,packlength);
}
from+=packlength; from+=packlength;
if (length) if (length)
memcpy_fixed(to+packlength, &from, sizeof(from)); memcpy_fixed(to+packlength, &from, sizeof(from));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment