1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

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
This commit is contained in:
unknown
2007-08-29 09:44:37 +02:00
parent 413a59a3bc
commit d27ec7a5e7
2 changed files with 5 additions and 20 deletions

View File

@ -7619,12 +7619,6 @@ uchar *Field_blob::pack(uchar *to, const uchar *from, uint max_length)
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 *to,
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));