mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  mysql.com:/home/my/mysql-5.1
This commit is contained in:
monty@mysql.com 2006-03-30 01:21:48 +03:00
commit 98052743ff
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/t/disabled.def
View file

@ -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

2
sql/ha_ndbcluster.cc
View file

@ -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
{