Add a testcase macro to ensure testing a boundary case in DISTINCT processing.

FossilOrigin-Name: ff9fc722dc481df1ce6a9733db1f033b88141d5d

diff --git a/manifest b/manifest
index b933d5723eda69be5d735a78e89505564844880f..291bcdee80b6a0c98c988145614e701590b3318f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sautomatic\sindexes\sare\sonly\screated\sin\sscenarios\swhere\sthey\smay\sbe\sused\smore\sthan\sonce.
-D 2011-07-02T15:32:57.635
+C Add\sa\stestcase\smacro\sto\sensure\stesting\sa\sboundary\scase\sin\sDISTINCT\sprocessing.
+D 2011-07-02T19:12:05.917
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -250,7 +250,7 @@ F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
 F src/wal.c 0c70ad7b1cac6005fa5e2cbefd23ee05e391c290
 F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c 30dc117ecd9406b7e442426cb5368199035c27ff
+F src/where.c c80c154db79ddbaff56ceb8879d96e71b090917d
 F test/8_3_names.test b93687beebd17f6ebf812405a6833bae5d1f4199
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@ -950,7 +950,7 @@ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-P 45e581bff7a75db6c9a2c45b73d034d0b8a166d1
-R 6e4dc8fc887e24292adb3ae0b641a038
-U dan
-Z d167de182be16055ea09a1a9326ef0ca
+P 27c65d4d9c58bfc4ea8f9337fa15090459fb26c5
+R 31108ab0f55c59747082de8c46c3b2b9
+U drh
+Z d273315218f9229b31cebba00fe83934

diff --git a/manifest.uuid b/manifest.uuid
index 670b072715f4d91ec73e5c9173d2d5c63b29cb42..e10d1d6e889505a946f4f1721844423914add239 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-27c65d4d9c58bfc4ea8f9337fa15090459fb26c5
\ No newline at end of file
+ff9fc722dc481df1ce6a9733db1f033b88141d5d
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index f843e107400c4fd93c10de792bc75cc120d5dc33..85a52fadff27feb65a08bf2b1a0f26e74060c055 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -1455,6 +1455,7 @@ static int isDistinctIndex(
   int i;                          /* Iterator variable */
 
   if( pIdx->zName==0 || pDistinct==0 || pDistinct->nExpr>=BMS ) return 0;
+  testcase( pDistinct->nExpr==BMS-1 );
 
   /* Loop through all the expressions in the distinct list. If any of them
   ** are not simple column references, return early. Otherwise, test if the