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

Merged windows compile error fix from #1510

Browse source 
git-svn-id: file:///svn/toku/tokudb@10346 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Yoni Fogel 2013-04-16 23:57:44 -04:00
parent dbc0a3bae5
commit 42f2f8d1a3
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
newbrt/block_table.c
View file

@ -336,13 +336,6 @@ toku_block_dump_translation(BLOCK_TABLE bt, u_int64_t offset) {
unlock_for_blocktable(bt); unlock_for_blocktable(bt);
} }
void
toku_block_recovery_set_unused_blocks(BLOCK_TABLE bt, BLOCKNUM newunused) {
lock_for_blocktable(bt);
bt->unused_blocks = newunused;
unlock_for_blocktable(bt);
}
void void
toku_block_memcpy_translation_table(BLOCK_TABLE bt, size_t n, void *p) { toku_block_memcpy_translation_table(BLOCK_TABLE bt, size_t n, void *p) {
lock_for_blocktable(bt); lock_for_blocktable(bt);

3
newbrt/brt.c
View file

@ -2704,6 +2704,9 @@ static int brt_init_header(BRT t) {
} else { } else {
lh.u.one.root = t->h->roots[0]; lh.u.one.root = t->h->roots[0];
} }
#ifdef __ICL
lh = lh; //Satisfy icl (variable set but unused)
#endif
//if ((r=toku_log_fheader(toku_txn_logger(txn), (LSN*)0, 0, toku_txn_get_txnid(txn), toku_cachefile_filenum(t->cf), lh))) { return r; } //if ((r=toku_log_fheader(toku_txn_logger(txn), (LSN*)0, 0, toku_txn_get_txnid(txn), toku_cachefile_filenum(t->cf), lh))) { return r; }
} }
if ((r=setup_initial_brt_root_node(t, root))!=0) { return r; } if ((r=setup_initial_brt_root_node(t, root))!=0) { return r; }

2
newbrt/recover.c
View file

@ -242,7 +242,7 @@ toku_recover_enqrootentry (LSN lsn __attribute__((__unused__)), FILENUM filenum,
struct brt_cmd cmd; struct brt_cmd cmd;
DBT keydbt, valdbt; DBT keydbt, valdbt;
cmd.type=typ; cmd.type=(enum brt_cmd_type) typ;
cmd.xid =xid; cmd.xid =xid;
cmd.u.id.key = toku_fill_dbt(&keydbt, key.data, key.len); cmd.u.id.key = toku_fill_dbt(&keydbt, key.data, key.len);
cmd.u.id.val = toku_fill_dbt(&valdbt, val.data, val.len); cmd.u.id.val = toku_fill_dbt(&valdbt, val.data, val.len);