mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 12:01:42 +01:00
#3798 fix the valgrind errors with the msnfilter test compiled with icc closes[t:3798]
git-svn-id: file:///svn/toku/tokudb@34665 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
parent
09ec29dc8a
commit
ec3c3646c0
1 changed files with 4 additions and 5 deletions
|
@ -77,7 +77,6 @@ append_leaf(BRT brt, BRTNODE leafnode, void *key, size_t keylen, void *val, size
|
||||||
assert(pair2.call_count==1);
|
assert(pair2.call_count==1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// now verify that message with lesser (older) msn is rejected
|
// now verify that message with lesser (older) msn is rejected
|
||||||
msn.msn = msn.msn - 10;
|
msn.msn = msn.msn - 10;
|
||||||
BRT_MSG_S cmd3 = { BRT_INSERT, msn, xids_get_root_xids(), .u.id = { &thekey, &badval } };
|
BRT_MSG_S cmd3 = { BRT_INSERT, msn, xids_get_root_xids(), .u.id = { &thekey, &badval } };
|
||||||
|
@ -90,16 +89,16 @@ append_leaf(BRT brt, BRTNODE leafnode, void *key, size_t keylen, void *val, size
|
||||||
assert(pair2.call_count==2);
|
assert(pair2.call_count==2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// dont forget to dirty the node
|
// dont forget to dirty the node
|
||||||
leafnode->dirty = 1;
|
leafnode->dirty = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
populate_leaf(BRT brt, BRTNODE leafnode, int k, int v) {
|
populate_leaf(BRT brt, BRTNODE leafnode, int k, int v) {
|
||||||
append_leaf(brt, leafnode, &k, sizeof k, &v, sizeof v);
|
char vbuf[32]; // store v in a buffer large enough to dereference unaligned int's
|
||||||
|
memset(vbuf, 0, sizeof vbuf);
|
||||||
|
memcpy(vbuf, &v, sizeof v);
|
||||||
|
append_leaf(brt, leafnode, &k, sizeof k, vbuf, sizeof v);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Add table
Reference in a new issue