diff --git a/manifest b/manifest
index 45deaab9a5..d8815e1f6a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sproblems\scompiling\swith\smemory-management\senabled.\sTicket\s#1619.\s(CVS\s2960)
-D 2006-01-16T15:32:23
+C Test\sfile\sfixes\sfor\slibaries\scompiled\swith\svarious\sSQLITE_OMIT_\smacros.\s(CVS\s2961)
+D 2006-01-16T16:24:25
 F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -99,17 +99,17 @@ F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/all.test a23fcbbf1f53515bde840d78732a6d94c673b327
 F test/alter.test 1ac1263c8436bce05143565ed79c3c3c7c4bacaa
 F test/alter2.test cc0b8832e4e98605dbc26910efd4bb89abe59cb2
-F test/alter3.test 6e144ea3dcc395afcc28e794bb532be83dc8fdcb
+F test/alter3.test a06d53b2dd1e16cb6f6d44022f9ca04c94da433e
 F test/altermalloc.test 6e1f404ec021eb2ba6582e3c77b0a35cf206b7af
 F test/analyze.test 2f55535aa335785db1a2f97d3f3831c16c09f8b0
 F test/async.test 0f71d47219311c1e7c65b95ef18faa7b65472913
-F test/attach.test dae07fa1554b618b9cc4c7bc349b3bc1a532180e
+F test/attach.test 036315207c477211470168bf121b1c493f781515
 F test/attach2.test 0e6a7c54343c85dd877a1e86073a05176043ed40
 F test/attach3.test 63013383adc4380af69779f34f4af19bd49f7cbe
 F test/attachmalloc.test cdb26c42850f04698377ccec05f5fa89d987837c
-F test/auth.test 11f73157a2c19e3f376598aaac9c5572c33e12cb
+F test/auth.test 639288b5dace7db3e1fce85d38893fc30bbfe50b
 F test/autoinc.test 60005a676e3e4e17dfa9dbd08aa0b76587ff97e3
-F test/autovacuum.test 9471d58a08b14dc0d2c15b87583c46d1744343d6
+F test/autovacuum.test 0dd22b0e1fe2013abe03e2ef5000bb3b9c1b6666
 F test/autovacuum_crash.test 05a63b8805b20cfba7ace82856ce4ccdda075a31
 F test/autovacuum_ioerr.test c46a76869cb6eddbbb40b419b2b6c4c001766b1f
 F test/autovacuum_ioerr2.test 2f8a3fb31f833fd0ca86ad4ad98913c73e807572
@@ -131,7 +131,7 @@ F test/busy.test 0271c854738e23ad76e10d4096a698e5af29d211
 F test/capi2.test b9354d6c37e6f8f858c08952ebc9709712581221
 F test/capi3.test 318098b606490b2e29c6228743e5c4b37da8c368
 F test/capi3b.test 5f0bc94b104e11086b1103b20277e1910f59c7f4
-F test/cast.test 2543165ced4249c89ce5f0352222df503a98b9e5
+F test/cast.test aabdcb3873bb2f40d855bf63950f6d99a5a196c7
 F test/check.test 686df5fd9fb986198787f00a79d86b68feb02e32
 F test/collate1.test add9454cef160677bb8b34148b8f277ce7f9f1c4
 F test/collate2.test 224a632ba04907c049804b08162efd234aa7871f
@@ -149,9 +149,9 @@ F test/default.test 252298e42a680146b1dd64f563b95bdf088d94fb
 F test/delete.test 525a6953bc3978780cae35f3eaf1027cf4ce887d
 F test/delete2.test d20b08733243f1890079f3b48f2356fbb62212b2
 F test/delete3.test 555e84a00a99230b7d049d477a324a631126a6ab
-F test/descidx1.test 616076c4fd7efb0098a69a53f965af6e1eb4e7ca
+F test/descidx1.test 3d243c802280e93a83ca6679bf0e3ce83d4ca5e6
 F test/descidx2.test f9f73c562932b81207faa525cd52acdfd2fc0482
-F test/descidx3.test b826d067392d48387f19f70f2ea51a93fd0d4ec1
+F test/descidx3.test 51eaeee554ca97caa4695b493686e0ed04046b1a
 F test/diskfull.test d828d72adfc9e2d1a194d25996718c1989152cf9
 F test/distinctagg.test 2b89d1c5220d966a30ba4b40430338669301188b
 F test/enc.test 7a03417a1051fe8bc6c7641cf4c8c3f7e0066d52
@@ -161,12 +161,12 @@ F test/expr.test a513aceb5d89042232e0d07ac5a1591965cf3963
 F test/fkey1.test 153004438d51e6769fb1ce165f6313972d6263ce
 F test/format4.test 9f31d41d4f926cab97b2ebe6be00a6ab12dece87
 F test/func.test a7119afcc16abdf24b24486684fb888279008f75
-F test/hook.test fc6821544ab2e0aacb398b742cdca925d4fb884c
+F test/hook.test 60579eb9db0c8de27c6d92661d6912612bef5e1f
 F test/in.test cead6165aebbe0d451bb2263a307173acfeb6240
 F test/index.test c90ab389586dbddfeb6817cd137737b2de1b6522
 F test/index2.test 9ad98243fd7fe833795a9cc662f371f0eed4ff4f
 F test/index3.test f66718cd92ce1216819d47e6a156755e4b2c4ca1
-F test/insert.test b0a89e1568fe9890758f8f2b43b68e840e8f1a1a
+F test/insert.test 51ab0b19169c91d7b3f64009d309ed5cf1b48df5
 F test/insert2.test 5a20e1ace5fa0800b58d28284212290189b49aed
 F test/insert3.test c67f0240b1c17e71fa2ed8bb6de064928f549f95
 F test/interrupt.test cd24dc5bedd02325be4bfa5d6209fae01c465157
@@ -199,7 +199,7 @@ F test/misc1.test 7aabf32e698ef7cc1253f5e7fc216c65870ce485
 F test/misc2.test 17949ae34df8a60e318b2a14492b8cb62cd2072a
 F test/misc3.test 7bd937e2c62bcc6be71939faf068d506467b1e03
 F test/misc4.test b043a05dea037cca5989f3ae09552fa16119bc80
-F test/misc5.test 129e19d3844bcc928051a30de34268e28a4bea6f
+F test/misc5.test aa5d7b4ef0963aaa87c18654e266682ca3565779
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
 F test/notnull.test 7a08117a71e74b0321aaa937dbeb41a09d6eb1d0
 F test/null.test db52272f9628ae9e77ab451cf0fb3871a98c5f00
@@ -225,7 +225,7 @@ F test/select5.test 07a90ab3c7e3f0a241a9cdea1d997b2c8a89ff0b
 F test/select6.test f459a19bdac0501c4d3eb1a4df4b7a76f1bb8ad4
 F test/select7.test 1bf795b948c133a15a2a5e99d3270e652ec58ce6
 F test/server1.test e328b8e641ba8fe9273132cfef497383185dc1f5
-F test/shared.test 6b686dcc6a51fd0a1fb2779f4621469d243de8df
+F test/shared.test 79bec0fa6c12b536d62a1304c6389348aa6ec6bd
 F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
 F test/subquery.test e6de53332c0301b3cfa34edc3f3cd5fa1e859efd
 F test/subselect.test 2d13fb7f450db3595adcdd24079a0dd1d2d6abc2
@@ -241,9 +241,9 @@ F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c 97a830d53c24c42290501fdfba4a6e5bdd34748b
 F test/tkt1435.test f768e5415d102fa1d8de3f548469d8fd1b79abd8
 F test/tkt1443.test bbd1fa7070783845aa42cdd35867a5ac73e5947a
-F test/tkt1444.test 5ef55d36dba1a39a96c728a519e66378a6f6816f
+F test/tkt1444.test 31e25ca9f850e4d75ce5fcaa69f1f96558ad9416
 F test/tkt1449.test 541021eb3c652848deb44f1407d692a9c42b6099
-F test/tkt1473.test 0c7f4e94946d5e420c0f4ce393d05703b729a848
+F test/tkt1473.test fd90eaa945d930e6f1bbb7b024848f83f063bc5d
 F test/tkt1501.test 0cf859299f0052ecfaf7db6f0984f122c7db5d15
 F test/tkt1512.test 8efd8d07e27e99d7462f75b5711de65eb7708baf
 F test/tkt1514.test baa587a69fa2e8d575ebdaf1460f711281dcba49
@@ -261,16 +261,16 @@ F test/trigger6.test 0e411654f122552da6590f0b4e6f781048a4a9b9
 F test/trigger7.test 0afa870be2ce1b132cdb85b17a4a4ef45aa8cece
 F test/types.test a74083427a73ff8af2723bae209d09cce5722c3a
 F test/types2.test 81dd1897be8ef4b5b73d0006e6076abe40610de3
-F test/types3.test e5f789503849294de74a23b433168e8211523a25
+F test/types3.test f9098dbb92bbc67cdde9dda70d65cded10ca3eb0
 F test/unique.test 0253c4227a5dc533e312202ce21ecfad18058d18
 F test/update.test 7669ca789d62c258b678e8aa7a22a57eac10f2cf
 F test/utf16.test f9c13f4e2b48c42d0bfc96647d82fdf7bc11fc55
 F test/vacuum.test 37f998b841cb335397c26d9bbc3457182af2565f
-F test/vacuum2.test 5d77e98c458bcdbeecc6327de5107179ba1aa095
+F test/vacuum2.test 5aea8c88a65cb29f7d175296e7c819c6158d838c
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/view.test 354bd0ceb363e88da8ce98fb47e18550d7594b13
 F test/where.test ee7c9a6659b07e1ee61177f6e7ff71565ee2c9df
-F test/where2.test d85bd79cdd9e3226f25f7c4d1de3f211083a25e3
+F test/where2.test 2a50005957786861c3e9261bf25d7479cad63fc9
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/lemon.c 26d271a753ef87fe1e6194f53c594ab5e6783d85
 F tool/lempar.c 424df14a48736bb961ed47acf30c26d66ed85a62
@@ -341,7 +341,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 0d5d83bcbd65dd7ae968909acfee075185e49c38
-R 22303cb699131fe98d9532ccd2f42eda
+P 36b03259654ffa9b14ebe1093984b29e9efbd56c
+R 75313d1d094051d9599acb13b95119d7
 U danielk1977
-Z aea72533a8a2ee1ff7fb69de07973569
+Z 235cd671730832e0ed73a26dff915eed
diff --git a/manifest.uuid b/manifest.uuid
index ea91a71c1b..028eddc598 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-36b03259654ffa9b14ebe1093984b29e9efbd56c
\ No newline at end of file
+c058f483a52c8043178b6329aa5e58bedf0c8277
\ No newline at end of file
diff --git a/test/alter3.test b/test/alter3.test
index 1ec3eaddef..5a2660d56f 100644
--- a/test/alter3.test
+++ b/test/alter3.test
@@ -13,7 +13,7 @@
 # file format change that may be used in the future to implement
 # "ALTER TABLE ... ADD COLUMN".
 #
-# $Id: alter3.test,v 1.7 2005/12/30 16:28:02 danielk1977 Exp $
+# $Id: alter3.test,v 1.8 2006/01/16 16:24:25 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -87,13 +87,15 @@ do_test alter3-1.5 {
     SELECT sql FROM sqlite_master WHERE tbl_name = 't1';
   }
 } {{CREATE TABLE t1(a, b, c, d CHECK (a>d))}}
-do_test alter3-1.6 {
-  execsql {
-    CREATE TABLE t2(a, b, UNIQUE(a, b));
-    ALTER TABLE t2 ADD c REFERENCES t1(c)  ;
-    SELECT sql FROM sqlite_master WHERE tbl_name = 't2' AND type = 'table';
-  }
-} {{CREATE TABLE t2(a, b, c REFERENCES t1(c), UNIQUE(a, b))}}
+ifcapable foreignkey {
+  do_test alter3-1.6 {
+    execsql {
+      CREATE TABLE t2(a, b, UNIQUE(a, b));
+      ALTER TABLE t2 ADD c REFERENCES t1(c)  ;
+      SELECT sql FROM sqlite_master WHERE tbl_name = 't2' AND type = 'table';
+    }
+  } {{CREATE TABLE t2(a, b, c REFERENCES t1(c), UNIQUE(a, b))}}
+}
 do_test alter3-1.7 {
   execsql {
     CREATE TABLE t3(a, b, UNIQUE(a, b));
@@ -102,10 +104,13 @@ do_test alter3-1.7 {
   }
 } {{CREATE TABLE t3(a, b, c VARCHAR(10, 20), UNIQUE(a, b))}}
 do_test alter3-1.99 {
+  catchsql {
+    # May not exist if foriegn-keys are omitted at compile time.
+    DROP TABLE t2; 
+  }
   execsql {
     DROP TABLE abc; 
     DROP TABLE t1; 
-    DROP TABLE t2; 
     DROP TABLE t3; 
   }
 } {}
diff --git a/test/attach.test b/test/attach.test
index 4799ce1e51..f195fbe977 100644
--- a/test/attach.test
+++ b/test/attach.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH and DETACH commands
 # and related functionality.
 #
-# $Id: attach.test,v 1.41 2005/11/29 03:13:22 drh Exp $
+# $Id: attach.test,v 1.42 2006/01/16 16:24:25 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -728,13 +728,6 @@ do_test attach-6.3 {
     CREATE TABLE no_such_db.t1(a, b, c);
   }
 } {1 {unknown database no_such_db}}
-ifcapable !compound {
-  do_test attach-6.4 {
-    catchsql {
-      CREATE TEMP TABLE db2.temp1(a, b, c);
-    }
-  } {1 {temporary table name must be unqualified}}
-}
 for {set i 2} {$i<=15} {incr i} {
   catch {db$i close}
 }
diff --git a/test/auth.test b/test/auth.test
index a328a8c1e2..0e0f8efa71 100644
--- a/test/auth.test
+++ b/test/auth.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH and DETACH commands
 # and related functionality.
 #
-# $Id: auth.test,v 1.31 2006/01/16 15:14:28 danielk1977 Exp $
+# $Id: auth.test,v 1.32 2006/01/16 16:24:25 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -2210,14 +2210,16 @@ do_test auth-5.1 {
 
 # Ticket #1607
 #
-do_test auth-5.2 {
-  execsql {
-    SELECT name FROM (
-      SELECT * FROM sqlite_master UNION ALL SELECT * FROM sqlite_temp_master)
-    WHERE type='table'
-    ORDER BY name
-  }
-} {sqlite_stat1 t1 t2 t3 t4 tx v1chng}
+ifcapable compound {
+  do_test auth-5.2 {
+    execsql {
+      SELECT name FROM (
+        SELECT * FROM sqlite_master UNION ALL SELECT * FROM sqlite_temp_master)
+      WHERE type='table'
+      ORDER BY name
+    }
+  } {sqlite_stat1 t1 t2 t3 t4 tx v1chng}
+}
 
 
 rename proc {}
diff --git a/test/autovacuum.test b/test/autovacuum.test
index 0e2c8d70e2..c71ba8114c 100644
--- a/test/autovacuum.test
+++ b/test/autovacuum.test
@@ -11,14 +11,14 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the SELECT statement.
 #
-# $Id: autovacuum.test,v 1.19 2005/09/16 09:52:30 danielk1977 Exp $
+# $Id: autovacuum.test,v 1.20 2006/01/16 16:24:25 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
 # If this build of the library does not support auto-vacuum, omit this
 # whole file.
-ifcapable {!autovacuum} {
+ifcapable {!autovacuum || !pragma} {
   finish_test
   return
 }
diff --git a/test/cast.test b/test/cast.test
index 82d4d2c37c..90a7f7ac93 100644
--- a/test/cast.test
+++ b/test/cast.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the CAST operator.
 #
-# $Id: cast.test,v 1.3 2005/11/01 15:48:25 drh Exp $
+# $Id: cast.test,v 1.4 2006/01/16 16:24:25 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -24,36 +24,38 @@ ifcapable !cast {
 
 # Tests for the CAST( AS blob), CAST( AS text) and CAST( AS numeric) built-ins
 #
-do_test cast-1.1 {
-  execsql {SELECT x'616263'}
-} abc
-do_test cast-1.2 {
-  execsql {SELECT typeof(x'616263')}
-} blob
-do_test cast-1.3 {
-  execsql {SELECT CAST(x'616263' AS text)}
-} abc
-do_test cast-1.4 {
-  execsql {SELECT typeof(CAST(x'616263' AS text))}
-} text
-do_test cast-1.5 {
-  execsql {SELECT CAST(x'616263' AS numeric)}
-} 0
-do_test cast-1.6 {
-  execsql {SELECT typeof(CAST(x'616263' AS numeric))}
-} integer
-do_test cast-1.7 {
-  execsql {SELECT CAST(x'616263' AS blob)}
-} abc
-do_test cast-1.8 {
-  execsql {SELECT typeof(CAST(x'616263' AS blob))}
-} blob
-do_test cast-1.9 {
-  execsql {SELECT CAST(x'616263' AS integer)}
-} 0
-do_test cast-1.10 {
-  execsql {SELECT typeof(CAST(x'616263' AS integer))}
-} integer
+ifcapable bloblit {
+  do_test cast-1.1 {
+    execsql {SELECT x'616263'}
+  } abc
+  do_test cast-1.2 {
+    execsql {SELECT typeof(x'616263')}
+  } blob
+  do_test cast-1.3 {
+    execsql {SELECT CAST(x'616263' AS text)}
+  } abc
+  do_test cast-1.4 {
+    execsql {SELECT typeof(CAST(x'616263' AS text))}
+  } text
+  do_test cast-1.5 {
+    execsql {SELECT CAST(x'616263' AS numeric)}
+  } 0
+  do_test cast-1.6 {
+    execsql {SELECT typeof(CAST(x'616263' AS numeric))}
+  } integer
+  do_test cast-1.7 {
+    execsql {SELECT CAST(x'616263' AS blob)}
+  } abc
+  do_test cast-1.8 {
+    execsql {SELECT typeof(CAST(x'616263' AS blob))}
+  } blob
+  do_test cast-1.9 {
+    execsql {SELECT CAST(x'616263' AS integer)}
+  } 0
+  do_test cast-1.10 {
+    execsql {SELECT typeof(CAST(x'616263' AS integer))}
+  } integer
+}
 do_test cast-1.11 {
   execsql {SELECT null}
 } {{}}
diff --git a/test/descidx1.test b/test/descidx1.test
index 816e8e0c50..15972401c1 100644
--- a/test/descidx1.test
+++ b/test/descidx1.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is descending indices.
 #
-# $Id: descidx1.test,v 1.4 2006/01/12 01:56:44 drh Exp $
+# $Id: descidx1.test,v 1.5 2006/01/16 16:24:25 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -170,58 +170,60 @@ do_test descidx1-3.26 {
 # Create a table with indices that are descending on some terms and
 # ascending on others.
 #
-do_test descidx1-4.1 {
-  execsql {
-    CREATE TABLE t2(a INT, b TEXT, c BLOB, d REAL);
-    CREATE INDEX i3 ON t2(a ASC, b DESC, c ASC);
-    CREATE INDEX i4 ON t2(b DESC, a ASC, d DESC);
-    INSERT INTO t2 VALUES(1,'one',x'31',1.0);
-    INSERT INTO t2 VALUES(2,'two',x'3232',2.0);
-    INSERT INTO t2 VALUES(3,'three',x'333333',3.0);
-    INSERT INTO t2 VALUES(4,'four',x'34343434',4.0);
-    INSERT INTO t2 VALUES(5,'five',x'3535353535',5.0);
-    INSERT INTO t2 VALUES(6,'six',x'363636363636',6.0);
-    INSERT INTO t2 VALUES(2,'two',x'323232',2.1);
-    INSERT INTO t2 VALUES(2,'zwei',x'3232',2.2);
-    INSERT INTO t2 VALUES(2,NULL,NULL,2.3);
-    SELECT count(*) FROM t2;
-  }
-} {9}
-do_test descidx1-4.2 {
-  execsql {
-    SELECT d FROM t2 ORDER BY a;
-  }
-} {1.0 2.2 2.0 2.1 2.3 3.0 4.0 5.0 6.0}
-do_test descidx1-4.3 {
-  execsql {
-    SELECT d FROM t2 WHERE a>=2;
-  }
-} {2.2 2.0 2.1 2.3 3.0 4.0 5.0 6.0}
-do_test descidx1-4.4 {
-  execsql {
-    SELECT d FROM t2 WHERE a>2;
-  }
-} {3.0 4.0 5.0 6.0}
-do_test descidx1-4.5 {
-  execsql {
-    SELECT d FROM t2 WHERE a=2 AND b>'two';
-  }
-} {2.2}
-do_test descidx1-4.6 {
-  execsql {
-    SELECT d FROM t2 WHERE a=2 AND b>='two';
-  }
-} {2.2 2.0 2.1}
-do_test descidx1-4.7 {
-  execsql {
-    SELECT d FROM t2 WHERE a=2 AND b<'two';
-  }
-} {}
-do_test descidx1-4.8 {
-  execsql {
-    SELECT d FROM t2 WHERE a=2 AND b<='two';
-  }
-} {2.0 2.1}
+ifcapable bloblit {
+  do_test descidx1-4.1 {
+    execsql {
+      CREATE TABLE t2(a INT, b TEXT, c BLOB, d REAL);
+      CREATE INDEX i3 ON t2(a ASC, b DESC, c ASC);
+      CREATE INDEX i4 ON t2(b DESC, a ASC, d DESC);
+      INSERT INTO t2 VALUES(1,'one',x'31',1.0);
+      INSERT INTO t2 VALUES(2,'two',x'3232',2.0);
+      INSERT INTO t2 VALUES(3,'three',x'333333',3.0);
+      INSERT INTO t2 VALUES(4,'four',x'34343434',4.0);
+      INSERT INTO t2 VALUES(5,'five',x'3535353535',5.0);
+      INSERT INTO t2 VALUES(6,'six',x'363636363636',6.0);
+      INSERT INTO t2 VALUES(2,'two',x'323232',2.1);
+      INSERT INTO t2 VALUES(2,'zwei',x'3232',2.2);
+      INSERT INTO t2 VALUES(2,NULL,NULL,2.3);
+      SELECT count(*) FROM t2;
+    }
+  } {9}
+  do_test descidx1-4.2 {
+    execsql {
+      SELECT d FROM t2 ORDER BY a;
+    }
+  } {1.0 2.2 2.0 2.1 2.3 3.0 4.0 5.0 6.0}
+  do_test descidx1-4.3 {
+    execsql {
+      SELECT d FROM t2 WHERE a>=2;
+    }
+  } {2.2 2.0 2.1 2.3 3.0 4.0 5.0 6.0}
+  do_test descidx1-4.4 {
+    execsql {
+      SELECT d FROM t2 WHERE a>2;
+    }
+  } {3.0 4.0 5.0 6.0}
+  do_test descidx1-4.5 {
+    execsql {
+      SELECT d FROM t2 WHERE a=2 AND b>'two';
+    }
+  } {2.2}
+  do_test descidx1-4.6 {
+    execsql {
+      SELECT d FROM t2 WHERE a=2 AND b>='two';
+    }
+  } {2.2 2.0 2.1}
+  do_test descidx1-4.7 {
+    execsql {
+      SELECT d FROM t2 WHERE a=2 AND b<'two';
+    }
+  } {}
+  do_test descidx1-4.8 {
+    execsql {
+      SELECT d FROM t2 WHERE a=2 AND b<='two';
+    }
+  } {2.0 2.1}
+}
 
 do_test descidx1-5.1 {
   execsql {
diff --git a/test/descidx3.test b/test/descidx3.test
index bf39f1ef0a..82a73f2de4 100644
--- a/test/descidx3.test
+++ b/test/descidx3.test
@@ -11,12 +11,17 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is descending indices.
 #
-# $Id: descidx3.test,v 1.2 2006/01/14 08:02:28 danielk1977 Exp $
+# $Id: descidx3.test,v 1.3 2006/01/16 16:24:25 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !bloblit {
+  finish_test
+  return
+}
+
 # This procedure sets the value of the file-format in file 'test.db'
 # to $newval. Also, the schema cookie is incremented.
 # 
diff --git a/test/hook.test b/test/hook.test
index a65f0251ce..b969b5c4ac 100644
--- a/test/hook.test
+++ b/test/hook.test
@@ -17,7 +17,7 @@
 #      sqlite_update_hook    (tests hook-4-*)
 #      sqlite_rollback_hook  (tests hook-5.*)
 #
-# $Id: hook.test,v 1.9 2006/01/05 23:42:52 drh Exp $
+# $Id: hook.test,v 1.10 2006/01/16 16:24:25 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -209,17 +209,19 @@ do_test hook-4.3.1 {
     DELETE main t1 3 \
 ]
 set ::update_hook {}
-do_test hook-4.3.2 {
-  execsql {
-    SELECT * FROM t1 UNION SELECT * FROM t3;
-    SELECT * FROM t1 UNION ALL SELECT * FROM t3;
-    SELECT * FROM t1 INTERSECT SELECT * FROM t3;
-    SELECT * FROM t1 EXCEPT SELECT * FROM t3;
-    SELECT * FROM t1 ORDER BY b;
-    SELECT * FROM t1 GROUP BY b;
-  }
-  set ::update_hook
-} [list]
+ifcapable compound {
+  do_test hook-4.3.2 {
+    execsql {
+      SELECT * FROM t1 UNION SELECT * FROM t3;
+      SELECT * FROM t1 UNION ALL SELECT * FROM t3;
+      SELECT * FROM t1 INTERSECT SELECT * FROM t3;
+      SELECT * FROM t1 EXCEPT SELECT * FROM t3;
+      SELECT * FROM t1 ORDER BY b;
+      SELECT * FROM t1 GROUP BY b;
+    }
+    set ::update_hook
+  } [list]
+}
 db update_hook {}
 #
 #----------------------------------------------------------------------------
diff --git a/test/insert.test b/test/insert.test
index ae7ed919ef..fef73e3fa3 100644
--- a/test/insert.test
+++ b/test/insert.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the INSERT statement.
 #
-# $Id: insert.test,v 1.27 2005/07/08 17:13:47 drh Exp $
+# $Id: insert.test,v 1.28 2006/01/16 16:24:25 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -346,7 +346,7 @@ do_test insert-7.3 {
 # to see if the right-hand side of an INSERT...SELECT references the left-hand
 # side.
 #
-ifcapable subquery {
+ifcapable subquery&&compound {
   do_test insert-8.1 {
     execsql {
       INSERT INTO t3 SELECT * FROM (SELECT * FROM t3 UNION ALL SELECT 1,2,3)
diff --git a/test/misc5.test b/test/misc5.test
index 00321eb7fb..57745dce2f 100644
--- a/test/misc5.test
+++ b/test/misc5.test
@@ -13,7 +13,7 @@
 # This file implements tests for miscellanous features that were
 # left out of other test files.
 #
-# $Id: misc5.test,v 1.9 2006/01/14 08:02:28 danielk1977 Exp $
+# $Id: misc5.test,v 1.10 2006/01/16 16:24:25 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -510,7 +510,7 @@ do_test misc5-5.4 {
 db close
 file delete -force test.db
 sqlite3 db test.db
-ifcapable subquery {
+ifcapable subquery&&compound {
   do_test misc5-6.1 {
     catchsql {
       SELECT * FROM sqlite_master 
diff --git a/test/shared.test b/test/shared.test
index 3f82072bf6..270ba1965a 100644
--- a/test/shared.test
+++ b/test/shared.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: shared.test,v 1.15 2006/01/16 15:14:29 danielk1977 Exp $
+# $Id: shared.test,v 1.16 2006/01/16 16:24:25 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -336,25 +336,27 @@ do_test shared-$av.4.3.4 {
 # Finally, compile a read of the other database using handle 2. This
 # should also fail.
 #
-do_test shared-$av.4.4.1.2 {
-  # Sanity check 1: Check that the schema is what we think it is when viewed
-  # via handle 1.
-  execsql {
-    CREATE TABLE test2.ghi(g, h, i);
-    SELECT 'test.db:'||name FROM sqlite_master 
-    UNION ALL
-    SELECT 'test2.db:'||name FROM test2.sqlite_master;
-  }
-} {test.db:abc test.db:def test2.db:ghi}
-do_test shared-$av.4.4.1.2 {
-  # Sanity check 2: Check that the schema is what we think it is when viewed
-  # via handle 2.
-  execsql {
-    SELECT 'test2.db:'||name FROM sqlite_master 
-    UNION ALL
-    SELECT 'test.db:'||name FROM test.sqlite_master;
-  } db2
-} {test2.db:ghi test.db:abc test.db:def}
+ifcapable compound {
+  do_test shared-$av.4.4.1.2 {
+    # Sanity check 1: Check that the schema is what we think it is when viewed
+    # via handle 1.
+    execsql {
+      CREATE TABLE test2.ghi(g, h, i);
+      SELECT 'test.db:'||name FROM sqlite_master 
+      UNION ALL
+      SELECT 'test2.db:'||name FROM test2.sqlite_master;
+    }
+  } {test.db:abc test.db:def test2.db:ghi}
+  do_test shared-$av.4.4.1.2 {
+    # Sanity check 2: Check that the schema is what we think it is when viewed
+    # via handle 2.
+    execsql {
+      SELECT 'test2.db:'||name FROM sqlite_master 
+      UNION ALL
+      SELECT 'test.db:'||name FROM test.sqlite_master;
+    } db2
+  } {test2.db:ghi test.db:abc test.db:def}
+}
 
 do_test shared-$av.4.4.2 {
   set ::DB2 [sqlite3_connection_pointer db2]
@@ -422,11 +424,13 @@ do_test shared-$av.5.1.2 {
     DROP TABLE t1;
   } db2
 } {}
-do_test shared-$av.5.1.2 {
-  execsql {
-    SELECT * FROM sqlite_master UNION ALL SELECT * FROM test1.sqlite_master
-  } db1
-} {}
+ifcapable compound {
+  do_test shared-$av.5.1.2 {
+    execsql {
+      SELECT * FROM sqlite_master UNION ALL SELECT * FROM test1.sqlite_master
+    } db1
+  } {}
+}
 
 #--------------------------------------------------------------------------
 # Tests shared-6.* test that a query obtains all the read-locks it needs
@@ -441,11 +445,15 @@ do_test shared-$av.6.1.1 {
     INSERT INTO t1 VALUES(1, 2);
     INSERT INTO t2 VALUES(3, 4);
   } db1
-  execsql {
-    SELECT * FROM t1 UNION ALL SELECT * FROM t2;
-  } db2
-} {1 2 3 4}
-do_test shared-$av.6.1.2 {
+} {}
+ifcapable compound {
+  do_test shared-$av.6.1.2 {
+    execsql {
+      SELECT * FROM t1 UNION ALL SELECT * FROM t2;
+    } db2
+  } {1 2 3 4}
+}
+do_test shared-$av.6.1.3 {
   # Establish a write lock on table t2 via connection db2. Then make a 
   # UNION all query using connection db1 that first accesses t1, followed 
   # by t2. If the locks are grabbed at the start of the statement (as 
@@ -465,7 +473,7 @@ do_test shared-$av.6.1.2 {
   }
   set ret
 } {}
-do_test shared-$av.6.1.3 {
+do_test shared-$av.6.1.4 {
   execsql {
     COMMIT;
     BEGIN;
diff --git a/test/tkt1444.test b/test/tkt1444.test
index ba7f1f453b..230baf706e 100644
--- a/test/tkt1444.test
+++ b/test/tkt1444.test
@@ -17,6 +17,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable compound {
+  finish_test
+  return 
+}
+
 # The use of a VIEW that contained an ORDER BY clause within a UNION ALL
 # was causing problems.  See ticket #1444.
 #
diff --git a/test/tkt1473.test b/test/tkt1473.test
index 1795931398..6f23c150ac 100644
--- a/test/tkt1473.test
+++ b/test/tkt1473.test
@@ -17,6 +17,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable compound {
+  finish_test
+  return 
+}
+
 do_test tkt1473-1.1 {
   execsql {
     CREATE TABLE t1(a,b);
diff --git a/test/types3.test b/test/types3.test
index 18b6db7d5f..17ece37ce1 100644
--- a/test/types3.test
+++ b/test/types3.test
@@ -12,7 +12,7 @@
 # of this file is testing the interaction of SQLite manifest types
 # with Tcl dual-representations.
 #
-# $Id: types3.test,v 1.3 2005/11/14 22:29:06 drh Exp $
+# $Id: types3.test,v 1.4 2006/01/16 16:24:25 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -56,10 +56,12 @@ do_test types3-1.6 {
 
 # Check to make sure return values are of the right types.
 #
-do_test types3-2.1 {
-  set V [db one {SELECT x'616263'}]
-  tcl_variable_type V
-} bytearray
+ifcapable bloblit {
+  do_test types3-2.1 {
+    set V [db one {SELECT x'616263'}]
+    tcl_variable_type V
+  } bytearray
+}
 do_test types3-2.2 {
   set V [db one {SELECT 123}]
   tcl_variable_type V
diff --git a/test/vacuum2.test b/test/vacuum2.test
index 1693cbbced..4b087cf76f 100644
--- a/test/vacuum2.test
+++ b/test/vacuum2.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the VACUUM statement.
 #
-# $Id: vacuum2.test,v 1.1 2005/02/16 03:27:08 drh Exp $
+# $Id: vacuum2.test,v 1.2 2006/01/16 16:24:25 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -19,7 +19,7 @@ source $testdir/tester.tcl
 # If the VACUUM statement is disabled in the current build, skip all
 # the tests in this file.
 #
-ifcapable {!vacuum} {
+ifcapable {!vacuum||!autoinc} {
   finish_test
   return
 }
diff --git a/test/where2.test b/test/where2.test
index 86c4626a58..9e1b59d658 100644
--- a/test/where2.test
+++ b/test/where2.test
@@ -12,7 +12,7 @@
 # focus of this file is testing the use of indices in WHERE clauses
 # based on recent changes to the optimizer.
 #
-# $Id: where2.test,v 1.6 2006/01/14 08:02:29 danielk1977 Exp $
+# $Id: where2.test,v 1.7 2006/01/16 16:24:25 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -146,22 +146,24 @@ ifcapable subquery {
       ORDER BY w
     }
   } {99 6 10000 10006 sort t1 i1zyx}
-  do_test where2-4.4 {
-    queryplan {
-      SELECT * FROM t1 WHERE z IN (SELECT 10207 UNION SELECT 10006)
-                       AND y IN (10000,10201)
-                       AND x>0 AND x<10
-      ORDER BY w
-    }
-  } {99 6 10000 10006 100 6 10201 10207 sort t1 i1zyx}
-  do_test where2-4.5 {
-    queryplan {
-      SELECT * FROM t1 WHERE z IN (SELECT 10207 UNION SELECT 10006)
-                       AND y IN (SELECT 10000 UNION SELECT 10201)
-                       AND x>0 AND x<10
-      ORDER BY w
-    }
-  } {99 6 10000 10006 100 6 10201 10207 sort t1 i1zyx}
+  ifcapable compound {
+    do_test where2-4.4 {
+      queryplan {
+        SELECT * FROM t1 WHERE z IN (SELECT 10207 UNION SELECT 10006)
+                         AND y IN (10000,10201)
+                         AND x>0 AND x<10
+        ORDER BY w
+      }
+    } {99 6 10000 10006 100 6 10201 10207 sort t1 i1zyx}
+    do_test where2-4.5 {
+      queryplan {
+        SELECT * FROM t1 WHERE z IN (SELECT 10207 UNION SELECT 10006)
+                         AND y IN (SELECT 10000 UNION SELECT 10201)
+                         AND x>0 AND x<10
+        ORDER BY w
+      }
+    } {99 6 10000 10006 100 6 10201 10207 sort t1 i1zyx}
+  }
   do_test where2-4.6 {
     queryplan {
       SELECT * FROM t1
@@ -180,14 +182,16 @@ ifcapable subquery {
       ORDER BY w
     }
   } {99 6 10000 10006 100 6 10201 10207 sort t1 i1zyx}
-  do_test where2-4.7 {
-    queryplan {
-      SELECT * FROM t1 WHERE z IN (
-         SELECT 10207 UNION ALL SELECT 10006
-         UNION ALL SELECT 10006 UNION ALL SELECT 10207)
-      ORDER BY w
-    }
-  } {99 6 10000 10006 100 6 10201 10207 sort t1 i1zyx}
+  ifcapable compound {
+    do_test where2-4.7 {
+      queryplan {
+        SELECT * FROM t1 WHERE z IN (
+           SELECT 10207 UNION ALL SELECT 10006
+           UNION ALL SELECT 10006 UNION ALL SELECT 10207)
+        ORDER BY w
+      }
+    } {99 6 10000 10006 100 6 10201 10207 sort t1 i1zyx}
+  }
 
 } ;# ifcapable subquery