aboutsummaryrefslogtreecommitdiff
path: root/test/tclsqlite.test
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2012-09-28 13:05:48 +0000
committerdrh <drh@noemail.net>2012-09-28 13:05:48 +0000
commitc4645dacfb435002911b187b474fa0788db9cde0 (patch)
treee757051bb0f952d0cb149b62ff6bdbbfdb99eb82 /test/tclsqlite.test
parent40eaa08620a75a29f4849cd3572e64feaafce5ec (diff)
parentf784c1ede942139d136f7c00a1d8fb30a4a31f18 (diff)
downloadsqlite-c4645dacfb435002911b187b474fa0788db9cde0.tar.gz
sqlite-c4645dacfb435002911b187b474fa0788db9cde0.zip
Merge the latest trunk changes (especially "PRAGMA busy_timeout" and the
ORDER BY query planner optimizations) into the sessions branch. FossilOrigin-Name: 6ca8eae1f89d19ee23cbc3a869d85b57d29b4a7d
Diffstat (limited to 'test/tclsqlite.test')
-rw-r--r--test/tclsqlite.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/tclsqlite.test b/test/tclsqlite.test
index 9245bd701..51eea9848 100644
--- a/test/tclsqlite.test
+++ b/test/tclsqlite.test
@@ -143,11 +143,11 @@ do_test tcl-1.21 {
set v [catch {db total_changes xyz} msg]
lappend v $msg
} {1 {wrong # args: should be "db total_changes "}}
-do_test tcl-1.20 {
+do_test tcl-1.22 {
set v [catch {db copy} msg]
lappend v $msg
} {1 {wrong # args: should be "db copy CONFLICT-ALGORITHM TABLE FILENAME ?SEPARATOR? ?NULLINDICATOR?"}}
-do_test tcl-1.21 {
+do_test tcl-1.23 {
set v [catch {sqlite3 db2 test.db -vfs nosuchvfs} msg]
lappend v $msg
} {1 {no such vfs: nosuchvfs}}