aboutsummaryrefslogtreecommitdiff
path: root/test/permutations.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/permutations.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/permutations.test')
-rw-r--r--test/permutations.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/permutations.test b/test/permutations.test
index 6bbdd9b83..18377e8aa 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -99,7 +99,7 @@ if {$::tcl_platform(platform)!="unix"} {
set alltests [test_set $alltests -exclude {
all.test async.test quick.test veryquick.test
memleak.test permutations.test soak.test fts3.test
- mallocAll.test rtree.test session.test
+ mallocAll.test rtree.test full.test session.test
}]
set allquicktests [test_set $alltests -exclude {