database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-03 05:41:09 +03:00
Code Activity

addresses #554

Browse Source 
while investigating 554, came across this issue of not checking for proper value
This MAY fix 554, but we doubt it.

git-svn-id: file:///svn/tokudb@2953 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Yoni Fogel
2008-03-19 18:01:40 +00:00
parent c3024db098
commit 6153661e2c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lock_tree/lth.c
View File

@@ -108,13 +108,13 @@ void toku_lth_delete(toku_lth* lth, toku_lock_tree* key) {
toku_lth_elt* prev = head; toku_lth_elt* prev = head;
toku_lth_elt* current = prev->next_in_bucket; toku_lth_elt* current = prev->next_in_bucket;
while (current != head) { while (current != NULL) {
if (current->value.hash_key == key) break; if (current->value.hash_key == key) break;
prev = current; prev = current;
current = current->next_in_bucket; current = current->next_in_bucket;
} }
/* Must be found. */ /* Must be found. */
assert(current != head); assert(current);
current->prev_in_iteration->next_in_iteration = current->next_in_iteration; current->prev_in_iteration->next_in_iteration = current->next_in_iteration;
current->next_in_iteration->prev_in_iteration = current->prev_in_iteration; current->next_in_iteration->prev_in_iteration = current->prev_in_iteration;
prev->next_in_bucket = current->next_in_bucket; prev->next_in_bucket = current->next_in_bucket;

4
src/lock_tree/rth.c
View File

@@ -108,13 +108,13 @@ void toku_rth_delete(toku_rth* rth, DB_TXN* key) {
toku_rth_elt* prev = head; toku_rth_elt* prev = head;
toku_rth_elt* current = prev->next_in_bucket; toku_rth_elt* current = prev->next_in_bucket;
while (current != head) { while (current != NULL) {
if (current->value.hash_key == key) break; if (current->value.hash_key == key) break;
prev = current; prev = current;
current = current->next_in_bucket; current = current->next_in_bucket;
} }
/* Must be found. */ /* Must be found. */
assert(current != head); assert(current);
current->prev_in_iteration->next_in_iteration = current->next_in_iteration; current->prev_in_iteration->next_in_iteration = current->next_in_iteration;
current->next_in_iteration->prev_in_iteration = current->prev_in_iteration; current->next_in_iteration->prev_in_iteration = current->prev_in_iteration;
prev->next_in_bucket = current->next_in_bucket; prev->next_in_bucket = current->next_in_bucket;