Commit ba358872 authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/home/my/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents e7e029a9 fa24633f
......@@ -21,7 +21,6 @@ ndb_binlog_ddl_multi : Bug #18490 cluster: binlog events lost on remote mysql
ndb_cache2 : Bug #18597
ndb_gis : Bug #18600
ndb_load : Bug#17233
ndb_partition_list : Bug#18598
partition_03ndb : Bug#16385
ps_7ndb : dbug assert in RBR mode when executing test suite
#rpl_bit_npk : Bug#13418
......
......@@ -3399,7 +3399,7 @@ int ha_ndbcluster::rnd_pos(byte *buf, byte *pos)
*/
DBUG_DUMP("key+part", (char *)pos, key_length);
key_length= ref_length - sizeof(m_part_id);
part_spec.start_part= part_spec.end_part= *(pos + key_length);
part_spec.start_part= part_spec.end_part= *(uint32 *)(pos + key_length);
}
else
{
......
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