aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2014-11-18 20:49:30 +0000
committerdrh <drh@noemail.net>2014-11-18 20:49:30 +0000
commit64b600ff13d4bac1d459cf54b649b45e520aba4c (patch)
treeb9d2242eea593c2834786c15c31d87cbb80dfdf0 /test
parentbea3b976a95b00968d6f3ca496d5c1dfd3104527 (diff)
parentbb8f92529401b09dbc6e9df4ba3e38ae3a0789f3 (diff)
downloadsqlite-64b600ff13d4bac1d459cf54b649b45e520aba4c.tar.gz
sqlite-64b600ff13d4bac1d459cf54b649b45e520aba4c.zip
Merge in all the other ROLLBACK fixes from the branch-3.8.7 branch.
I don't know why I was doing them one-by-one. FossilOrigin-Name: 296b0c7397790ceadbdb330959e962f6491abc3e
Diffstat (limited to 'test')
-rw-r--r--test/savepoint7.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/savepoint7.test b/test/savepoint7.test
index 908ec571f..d8a02f1f8 100644
--- a/test/savepoint7.test
+++ b/test/savepoint7.test
@@ -78,7 +78,7 @@ do_test savepoint7-2.1 {
} msg]
db eval {RELEASE x1}
list $rc $msg [db eval {SELECT * FROM t2}]
-} {1 {callback requested query abort} {}}
+} {1 {abort due to ROLLBACK} {}}
do_test savepoint7-2.2 {
db eval {DELETE FROM t2;}
@@ -93,6 +93,6 @@ do_test savepoint7-2.2 {
}
} msg]
list $rc $msg [db eval {SELECT * FROM t2}]
-} {1 {callback requested query abort} {}}
+} {1 {abort due to ROLLBACK} {}}
finish_test