diff options
| -rw-r--r-- | mysql-test/suite/rpl_ndb/t/disabled.def | 4 | ||||
| -rw-r--r-- | sql/field.cc | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def index 90286ecc421..f4cbd3e9d0c 100644 --- a/mysql-test/suite/rpl_ndb/t/disabled.def +++ b/mysql-test/suite/rpl_ndb/t/disabled.def @@ -14,8 +14,8 @@ 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_ctype_ucs2_def : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset diff --git a/sql/field.cc b/sql/field.cc index 23dca96164e..c8e1572d60f 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7622,6 +7622,13 @@ uchar *Field_blob::pack(uchar *to, const uchar *from, uint max_length) ptr= (uchar*) from; } 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) { @@ -7658,8 +7665,17 @@ const uchar *Field_blob::unpack(uchar *to, const uchar *Field_blob::unpack(uchar *to, const uchar *from) { - memcpy(to,from,packlength); 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); + } from+=packlength; if (length) memcpy_fixed(to+packlength, &from, sizeof(from)); |