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

Addresses #293

Browse source 
Bugfixes in locktree.  Copy the payload to the memory allocated for it


git-svn-id: file:///svn/tokudb@1883 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Yoni Fogel 2008-01-25 15:46:22 +00:00
parent fd7d31062a
commit 74d75d6df4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lock_tree/locktree.c
View file

@ -112,7 +112,7 @@ static int __toku_payload_copy(toku_lock_tree* tree,
*payload_out = tree->malloc(len_in);
if (!*payload_out) return errno;
*len_out = len_in;
memcpy(payload_out, payload_in, len_in);
memcpy(*payload_out, payload_in, len_in);
}
return 0;
}
@ -597,7 +597,8 @@ static void __toku_lt_free_contents(toku_lock_tree* tree, toku_range_tree* rt) {
unsigned numfound;
r = toku_rt_find(rt, &query, 0, &tree->buf, &tree->buflen, &numfound);
if (r!=0) {
if (r==0) __toku_lt_free_points(tree, &query, numfound);
else {
/*
To free space the fast way, we need to allocate more space.
Since we can't, we free the slow way.
@ -615,7 +616,6 @@ static void __toku_lt_free_contents(toku_lock_tree* tree, toku_range_tree* rt) {
__toku_lt_free_points(tree, &query, numfound);
} while (TRUE);
}
else __toku_lt_free_points(tree, &query, numfound);
r = toku_rt_close(rt);
assert(r == 0);
}