Index: test/autoindex1.test ================================================================== --- test/autoindex1.test +++ test/autoindex1.test @@ -22,10 +22,11 @@ finish_test return } # Setup for logging +db close sqlite3_shutdown test_sqlite3_log [list lappend ::log] set ::log [list] sqlite3 db test.db Index: test/where2.test ================================================================== --- test/where2.test +++ test/where2.test @@ -304,10 +304,12 @@ SELECT b.* FROM t1 a, t1 b WHERE a.w=1 AND (b.z=10 OR a.y=b.z OR b.z=10) ORDER BY +b.w } } [list 1 0 4 4 2 1 9 10 sort a i1w b $::idx] + +if {[permutation] != "no_optimization"} { # Ticket #2249. Make sure the OR optimization is not attempted if # comparisons between columns of different affinities are needed. # do_test where2-6.7 { @@ -471,10 +473,12 @@ cksort { create unique index i9y on t9(y); select * from t8, t9 where a=1 and y=3 order by b, x } } {1 2 3 2 3 nosort} + +} ;# if {[permutation] != "no_optimization"} # Ticket #1807. Using IN constrains on multiple columns of # a multi-column index. # ifcapable subquery {