Commit 40a73816 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

compile with gcc 4.3. addresses #1185

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6471 c7de825b-a66e-492c-adef-691d508d4ae1
parent 789087df
...@@ -407,7 +407,7 @@ static int brtleaf_split (TOKULOGGER logger, FILENUM filenum, BRT t, BRTNODE nod ...@@ -407,7 +407,7 @@ static int brtleaf_split (TOKULOGGER logger, FILENUM filenum, BRT t, BRTNODE nod
if (seqinsert >= n_leafentries/2) { if (seqinsert >= n_leafentries/2) {
u_int32_t node_size = toku_serialize_brtnode_size(node); u_int32_t node_size = toku_serialize_brtnode_size(node);
break_at = n_leafentries - 1; break_at = n_leafentries - 1;
OMTVALUE v; OMTVALUE v = 0;
while (1) { while (1) {
r = toku_omt_fetch(node->u.l.buffer, break_at, &v, NULL); r = toku_omt_fetch(node->u.l.buffer, break_at, &v, NULL);
assert(r == 0); assert(r == 0);
...@@ -511,7 +511,7 @@ static int brtleaf_split (TOKULOGGER logger, FILENUM filenum, BRT t, BRTNODE nod ...@@ -511,7 +511,7 @@ static int brtleaf_split (TOKULOGGER logger, FILENUM filenum, BRT t, BRTNODE nod
//toku_verify_gpma(B->u.l.buffer); //toku_verify_gpma(B->u.l.buffer);
if (splitk) { if (splitk) {
memset(splitk, 0, sizeof *splitk); memset(splitk, 0, sizeof *splitk);
OMTVALUE lev; OMTVALUE lev = 0;
r=toku_omt_fetch(node->u.l.buffer, toku_omt_size(node->u.l.buffer)-1, &lev, NULL); r=toku_omt_fetch(node->u.l.buffer, toku_omt_size(node->u.l.buffer)-1, &lev, NULL);
assert(r==0); // that fetch should have worked. assert(r==0); // that fetch should have worked.
LEAFENTRY le=lev; LEAFENTRY le=lev;
...@@ -3063,7 +3063,7 @@ BOOL toku_brt_cursor_uninitialized(BRT_CURSOR c) { ...@@ -3063,7 +3063,7 @@ BOOL toku_brt_cursor_uninitialized(BRT_CURSOR c) {
} }
static inline void load_dbts_from_omt(BRT_CURSOR c, DBT *key, DBT *val) { static inline void load_dbts_from_omt(BRT_CURSOR c, DBT *key, DBT *val) {
OMTVALUE le; OMTVALUE le = 0;
int r = toku_omt_cursor_current(c->omtcursor, &le); int r = toku_omt_cursor_current(c->omtcursor, &le);
assert(r==0); assert(r==0);
if (key) { if (key) {
......
...@@ -850,7 +850,7 @@ int toku_omt_split_at(OMT omt, OMT *newomtp, u_int32_t index) { ...@@ -850,7 +850,7 @@ int toku_omt_split_at(OMT omt, OMT *newomtp, u_int32_t index) {
int toku_omt_merge(OMT leftomt, OMT rightomt, OMT *newomtp) { int toku_omt_merge(OMT leftomt, OMT rightomt, OMT *newomtp) {
int r; int r;
OMT newomt; OMT newomt = 0;
invalidate_cursors(leftomt); invalidate_cursors(leftomt);
invalidate_cursors(rightomt); invalidate_cursors(rightomt);
u_int32_t newsize = omt_size(leftomt)+omt_size(rightomt); u_int32_t newsize = omt_size(leftomt)+omt_size(rightomt);
......
...@@ -32,3 +32,11 @@ ...@@ -32,3 +32,11 @@
fun:deflate fun:deflate
fun:compress2 fun:compress2
} }
{
compress_is_not_valgrind_clean3_fedora9
Memcheck:Cond
obj:/lib64/libz.so.1.2.3
obj:/lib64/libz.so.1.2.3
fun:deflate
fun:compress2
}
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