Update a couple of test cases to account for the fact that ROLLBACK does not always abort all running SELECT statements.
FossilOrigin-Name: eba171e980fa4491dfee9d7e4df50c87a0ebbf87
This commit is contained in:
parent
0a9d9d566e
commit
302f583aa4
17
manifest
17
manifest
@ -1,5 +1,5 @@
|
||||
C Do\snot\sautomatically\sremove\sthe\sDISTINCT\skeyword\sfrom\s"a\sIN\s(SELECT\sDISTINCT\s...)"\sexpressions.\sFix\sfor\s[db87229497].
|
||||
D 2014-11-14T15:42:23.965
|
||||
C Update\sa\scouple\sof\stest\scases\sto\saccount\sfor\sthe\sfact\sthat\sROLLBACK\sdoes\snot\salways\sabort\sall\srunning\sSELECT\sstatements.
|
||||
D 2014-11-17T15:22:08.993
|
||||
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
|
||||
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
|
||||
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
|
||||
@ -648,7 +648,7 @@ F test/interrupt.test dfe9a67a94b0b2d8f70545ba1a6cca10780d71cc
|
||||
F test/intpkey.test 7506090fc08e028712a8bf47e5f54111947e3844
|
||||
F test/io.test 3a7abcef18727cc0f2399e04b0e8903eccae50f8
|
||||
F test/ioerr.test 2a24bd6ed5a8b062e64bfe1f6cf94fb25e92210d
|
||||
F test/ioerr2.test 9d71166f8466eda510f1af6137bdabaa82b5408d
|
||||
F test/ioerr2.test 2593563599e2cc6b6b4fcf5878b177bdd5d8df26
|
||||
F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
|
||||
F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
|
||||
F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
|
||||
@ -830,7 +830,7 @@ F test/shared7.test a81e99f83e6c51b02ac99c96fb3a2a7b5978c956
|
||||
F test/shared8.test 00a07bf5e1337ecf72e94542bdefdc330d7a2538
|
||||
F test/shared9.test 5f2a8f79b4d6c7d107a01ffa1ed05ae7e6333e21
|
||||
F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5
|
||||
F test/shared_err.test 0079c05c97d88cfa03989b7c20a8b266983087aa
|
||||
F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506
|
||||
F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
|
||||
F test/shell1.test d60946b5fde4d85fe06db7331dfe89011f564350
|
||||
F test/shell2.test c57da3a381c099b02c813ba156298d5c2f5c93a3
|
||||
@ -1205,8 +1205,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
|
||||
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
|
||||
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
|
||||
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
|
||||
P 402780a9c8df9e7ea898bdca49c1191042fe387a
|
||||
Q +55e453aadbb676dda07f0fa537d39ce184ef636c
|
||||
R 0bf0d6ff158ba2352191f711d5e9a856
|
||||
U drh
|
||||
Z fc11fd8e7149b148ee2e3386efe4bde7
|
||||
P 98457a57d642b35917eb9ad8f70065e273aad206
|
||||
R d8acddabccfe794436f7272593be21d9
|
||||
U dan
|
||||
Z 30deb4af13a2947d821f81a6f506118a
|
||||
|
@ -1 +1 @@
|
||||
98457a57d642b35917eb9ad8f70065e273aad206
|
||||
eba171e980fa4491dfee9d7e4df50c87a0ebbf87
|
@ -112,6 +112,12 @@ foreach bPersist [list 0 1] {
|
||||
}
|
||||
}
|
||||
|
||||
# When this test was written, an IO error within the UPDATE statement caused
|
||||
# a rollback, which tripped all read-cursors, causing the outer SELECT to
|
||||
# fail with "abort due to ROLLBACK". Now, the loop continues until the UPDATE
|
||||
# is run successfully. At this point the next IO error occurs within the
|
||||
# SELECT - throwing the "disk I/O error" that the test case now expects.
|
||||
#
|
||||
do_test ioerr2-5 {
|
||||
execsql {
|
||||
CREATE TABLE t2 AS SELECT * FROM t1;
|
||||
@ -130,7 +136,7 @@ do_test ioerr2-5 {
|
||||
}
|
||||
} msg]
|
||||
list $rc $msg
|
||||
} {1 {abort due to ROLLBACK}}
|
||||
} {1 {disk I/O error}} ;# used to be "{1 {abort due to ROLLBACK}}"
|
||||
|
||||
if {$::tcl_platform(platform) == "unix"} {
|
||||
# Cause the call to xAccess used by [pragma temp_store_directory] to
|
||||
|
@ -446,9 +446,15 @@ do_malloc_test shared_err-8 -tclprep {
|
||||
} {1}
|
||||
db2 close
|
||||
}
|
||||
|
||||
# When this test case was written, OOM errors in write statements would
|
||||
# cause transaction rollback, which would trip cursors in other statements,
|
||||
# aborting them. This no longer happens.
|
||||
#
|
||||
do_test shared_malloc-8.X {
|
||||
# Test that one or more queries were aborted due to the malloc() failure.
|
||||
expr $::aborted>=1
|
||||
# expr $::aborted>=1
|
||||
expr $::aborted==0
|
||||
} {1}
|
||||
|
||||
# This test is designed to catch a specific bug that was present during
|
||||
|
Loading…
x
Reference in New Issue
Block a user