diff options
author | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
---|---|---|
committer | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
commit | 4f9313b1de21a03df32bfba4d94207c78a2171b0 (patch) | |
tree | 6a637dd4dde653f870346a37ec6555eb0574949a /test/wal2.test | |
parent | 9da5e9acd37e51b86429d938e7e6a64ffb02da84 (diff) | |
parent | 1b5ba8e022836fa8ab93bc90df1b34a29ea6e134 (diff) |
Merge tag 'upstream/2.1.1'
Upstream version 2.1.1
Conflicts:
.gitignore
Diffstat (limited to 'test/wal2.test')
-rw-r--r-- | test/wal2.test | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/wal2.test b/test/wal2.test index f30c011..4371e98 100644 --- a/test/wal2.test +++ b/test/wal2.test @@ -86,7 +86,7 @@ proc incr_tvfs_hdr {file idx incrval} { # # 2. Attempt to read the database using the reader. Before the reader # has a chance to snapshot the wal-index header, increment one -# of the the integer fields (so that the reader ends up with a corrupted +# of the integer fields (so that the reader ends up with a corrupted # header). # # 3. Check that the reader recovers the wal-index and reads the correct @@ -126,9 +126,11 @@ set RECOVER [list \ {1 7 unlock exclusive} {0 1 unlock exclusive} \ ] set READ [list \ - {4 1 lock exclusive} {4 1 unlock exclusive} \ {4 1 lock shared} {4 1 unlock shared} \ ] +set INITSLOT [list \ + {4 1 lock exclusive} {4 1 unlock exclusive} \ +] foreach {tn iInsert res wal_index_hdr_mod wal_locks} " 2 5 {5 15} 0 {$RECOVER $READ} @@ -141,7 +143,7 @@ foreach {tn iInsert res wal_index_hdr_mod wal_locks} " 9 12 {12 78} 7 {$RECOVER $READ} 10 13 {13 91} 8 {$RECOVER $READ} 11 14 {14 105} 9 {$RECOVER $READ} - 12 15 {15 120} -1 {$READ} + 12 15 {15 120} -1 {$INITSLOT $READ} " { do_test wal2-1.$tn.1 { |