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

[t:2216] Fix deadlock bug introduced during merge of #2216

Browse source 
git-svn-id: file:///svn/toku/tokudb@18186 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Yoni Fogel 2013-04-16 23:59:01 -04:00
parent 7176886212
commit 465be5c1f1
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
newbrt/roll.c
View file

@ -347,9 +347,6 @@ toku_rollback_tablelock_on_empty_table (FILENUM filenum,
LSN UU(oplsn)) LSN UU(oplsn))
{ {
//TODO: Replace truncate function with something that doesn't need to mess with checkpoints. //TODO: Replace truncate function with something that doesn't need to mess with checkpoints.
toku_poll_txn_progress_function(txn, FALSE, TRUE);
yield(toku_checkpoint_safe_client_lock, yield_v);
toku_poll_txn_progress_function(txn, FALSE, FALSE);
// on rollback we have to make the file be empty, since we locked an empty table, and then may have done things to it. // on rollback we have to make the file be empty, since we locked an empty table, and then may have done things to it.
CACHEFILE cf; CACHEFILE cf;
@ -363,7 +360,9 @@ toku_rollback_tablelock_on_empty_table (FILENUM filenum,
// If r!=0 it could be because we grabbed a log on an empty table that doesn't even exist, and we never put anything into it. // If r!=0 it could be because we grabbed a log on an empty table that doesn't even exist, and we never put anything into it.
// So, just don't do anything in this case. // So, just don't do anything in this case.
BRT brt = brtv; BRT brt = brtv;
toku_poll_txn_progress_function(txn, FALSE, TRUE);
yield(toku_checkpoint_safe_client_lock, yield_v); yield(toku_checkpoint_safe_client_lock, yield_v);
toku_poll_txn_progress_function(txn, FALSE, FALSE);
r = toku_brt_truncate(brt); r = toku_brt_truncate(brt);
assert(r==0); assert(r==0);
toku_checkpoint_safe_client_unlock(); toku_checkpoint_safe_client_unlock();