mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix two of the cases in #1308. Addresses #1308.

Browse source 
git-svn-id: file:///svn/toku/tokudb.1032b@8274 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Bradley C. Kuszmaul 2013-04-16 23:57:30 -04:00 • committed by Yoni Fogel
parent f9e4e7c273
commit 95c77b2f6a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
newbrt/brt-serialize.c
View file

@ -725,7 +725,7 @@ int toku_serialize_brt_header_to (int fd, struct brt_header *h) {
u_int32_t checksum = x1764_finish(&w.checksum);
wbuf_int(&w, checksum);
ssize_t nwrote = toku_pwrite(fd, w.buf, size, h->block_translation_address_on_disk);
assert(nwrote==(ssize_t)size);
assert((u_int64_t)nwrote==size);
toku_free(w.buf);
};
unlock_for_pwrite();
@ -774,7 +774,8 @@ deserialize_brtheader (u_int32_t size, int fd, DISKOFF off, struct brt_header **
unsigned char *XMALLOC_N(h->block_translation_size_on_disk, tbuf);
{
ssize_t r = pread(fd, tbuf, h->block_translation_size_on_disk, h->block_translation_address_on_disk);
assert(r==(ssize_t)h->block_translation_size_on_disk);
// This cast is messed up in 32-bits if the block translation table is ever more than 4GB. But in that case, the translation table itself won't fit in main memory.
assert((u_int64_t)r==h->block_translation_size_on_disk);
}
{
// check the checksum