Disable unused NULL tests when SQLITE_ENABLE_STAT2 is not in use.

FossilOrigin-Name: 5ecd11788269e78dc26639b2503a10b7e25b2483

diff --git a/configure b/configure
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/install-sh b/install-sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/manifest b/manifest
index 4b39199807da00ad6c24d2bf0a670b6879285370..0538467c2958d9aa28c2e597c6d3b799d0200fd1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\s.testctrl\soption\sto\sCLI.
-D 2011-02-10T21:08:58
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Disable\sunused\sNULL\stests\swhen\sSQLITE_ENABLE_STAT2\sis\snot\sin\suse.
+D 2011-02-11T02:43:14.522
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -22,7 +25,7 @@ F art/src_logo.gif 9341ef09f0e53cd44c0c9b6fc3c16f7f3d6c2ad9
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure c38c1947db7ed4adaed2affcb09cea9d3acd5a9a
+F configure c38c1947db7ed4adaed2affcb09cea9d3acd5a9a x
 F configure.ac 87a3c71bbe9c925381c154413eea7f3cdc397244
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
@@ -98,7 +101,7 @@ F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
 F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
-F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
+F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F main.mk 54190fab7cdba523e311c274c95ea480f32abfb5
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
@@ -241,7 +244,7 @@ F src/vtab.c b297e8fa656ab5e66244ab15680d68db0adbec30
 F src/wal.c aca10a60655e103fc8630a75345000f43c6d47ca
 F src/wal.h 7a5fbb00114b7f2cd40c7e1003d4c41ce9d26840
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c ebecb7b9e08cf1c0bf84bbc26756ff09e9479f08
+F src/where.c 612ca339d1d1d076ff7d933ec86bb8548f978892
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 51756962d522e474338e9b2ebb26e7364d4aa125
@@ -906,7 +909,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 0ef8ffd12fce47c3c89e851e5116e2777ea9f435
-R 4437e53e14dbc4b7ac5c52d6271d4ae5
-U shaneh
-Z b1f21a25be3f68d4c976ca556987e3ea
+P f85afa0ecc7b31d32659ae53e70771cd42abda38
+R 6c9f8fa6a95f1c6416ba30a2f337f141
+U drh
+Z 031fc29c45bc927547b928a448afa15e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFNVKJGoxKgR168RlERAhU0AKCBT4jzm3Kj7UEwq0dWnN39SWVL6gCffkF9
+sYAMWWqE055NfvfyH8VwD8g=
+=sVIn
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 26922ac73ba7aaded876f348df802f63dec94f15..a33f4acee01b9da15e5ed7ac9e33979f520c2fd7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f85afa0ecc7b31d32659ae53e70771cd42abda38
\ No newline at end of file
+5ecd11788269e78dc26639b2503a10b7e25b2483
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 2fc0a80feb11dcb9331f51a2618de4fb55bdac23..7710225bb8c197b07cefce411b9cf81deb87fc0d 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -118,7 +118,11 @@ struct WhereTerm {
 #define TERM_ORINFO     0x10   /* Need to free the WhereTerm.u.pOrInfo object */
 #define TERM_ANDINFO    0x20   /* Need to free the WhereTerm.u.pAndInfo obj */
 #define TERM_OR_OK      0x40   /* Used during OR-clause processing */
-#define TERM_VNULL      0x80   /* Manufactured x>NULL or x<=NULL term */
+#ifdef SQLITE_ENABLE_STAT2
+#  define TERM_VNULL    0x80   /* Manufactured x>NULL or x<=NULL term */
+#else
+#  define TERM_VNULL    0x00   /* Disabled if not using stat2 */
+#endif
 
 /*
 ** An instance of the following structure holds all information about a