diff options
| author | Michael Widenius <monty@mysql.com> | 2008-12-08 20:31:16 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-12-08 20:31:16 +0200 |
| commit | d0fb8270dfa785392c2bc3ad4ffd61329586d887 (patch) | |
| tree | e2e95279d96acc56d49753ffccda0aeda68a7af0 /storage/maria/trnman.c | |
| parent | d83f6470243057fdd542bed0410dcabe09766713 (diff) | |
| download | mariadb-git-d0fb8270dfa785392c2bc3ad4ffd61329586d887.tar.gz | |
Fixed problem with crash in Maria _ma_setup_live_state() where history link didn't include needed state
mysql-test/mysql-test-run.pl:
Remove warnings in log about depricated mysqld options
storage/maria/ma_state.c:
More DBUG_PRINT
storage/maria/trnman.c:
Fixed wrong test if commit_trid is visible
Diffstat (limited to 'storage/maria/trnman.c')
| -rw-r--r-- | storage/maria/trnman.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/maria/trnman.c b/storage/maria/trnman.c index 538dc75b663..09c8f9a264f 100644 --- a/storage/maria/trnman.c +++ b/storage/maria/trnman.c @@ -876,7 +876,12 @@ my_bool trnman_exists_active_transactions(TrID min_id, TrID max_id, pthread_mutex_lock(&LOCK_trn_list); for (trn= active_list_min.next; trn != &active_list_max; trn= trn->next) { - if (trn->trid > min_id && trn->trid < max_id) + /* + We use >= for min_id as min_id is a commit_trid and trn->trid + is transaction id. In the case they are the same, then the + trn started after the min_id was committed. + */ + if (trn->trid >= min_id && trn->trid < max_id) { ret= 1; break; |