From 0e4022372c5942e2132799887099959b6a83e67d Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 20 Mar 2014 12:36:39 +0000 Subject: [PATCH] One possible fix for the [e39d032577d] problem it to replace the failing assert() with a testcase() as shown here. FossilOrigin-Name: eae6dfbe5535f4818b73806b13308b99dedb9f22 --- manifest | 15 +++++++++------ manifest.uuid | 2 +- src/where.c | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 41cb481776..bcb191bf43 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\san\sunnecessarily\sobtuse\suse\sof\sa\sbitmask\sflag. -D 2014-03-20T12:17:35.051 +C One\spossible\sfix\sfor\sthe\s[e39d032577d]\sproblem\sit\sto\sreplace\sthe\sfailing\nassert()\swith\sa\stestcase()\sas\sshown\shere. +D 2014-03-20T12:36:39.983 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -291,7 +291,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45 -F src/where.c e433accd201ca482c761e679f4a2ce2f6a7348e6 +F src/where.c 09246177a77e47f77c781d1822913784bd1536f1 F src/whereInt.h 921f935af8b684ffb49705610bda7284db1db138 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 @@ -1156,7 +1156,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 707ea170b3e26965b7e3982f7554d122d130b9a6 -R 829b1d227d22721b3fefbad8e2ead1b7 +P ca3140813198ab7ce470cf86334e55207f3461f9 +R e8cd78fc073c5419c5cddb44ad2f6bb8 +T *branch * tkt-e39d0325 +T *sym-tkt-e39d0325 * +T -sym-trunk * U drh -Z fcfbdaafabd38e7e728b08b0509fc847 +Z fb29f94974f12cdc3ad5aeed6e3c8ea2 diff --git a/manifest.uuid b/manifest.uuid index 444963914a..1b9c5cc66b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ca3140813198ab7ce470cf86334e55207f3461f9 \ No newline at end of file +eae6dfbe5535f4818b73806b13308b99dedb9f22 \ No newline at end of file diff --git a/src/where.c b/src/where.c index d13258ad66..06650c36be 100644 --- a/src/where.c +++ b/src/where.c @@ -4019,7 +4019,8 @@ static int whereLoopAddBtreeIndex( ); pNew->wsFlags |= WHERE_COLUMN_EQ; if( iCol<0 || (nInMul==0 && pNew->u.btree.nEq==pProbe->nKeyCol-1)){ - assert( (pNew->wsFlags & WHERE_COLUMN_IN)==0 || iCol<0 ); + /* Ticket [e39d032577df]: WHERE a=? AND b IN (?) -- a, b indexed */ + testcase( (pNew->wsFlags & WHERE_COLUMN_IN)!=0 && iCol>=0 ); if( iCol>=0 && pProbe->onError==OE_None ){ pNew->wsFlags |= WHERE_UNQ_WANTED; }else{ -- 2.47.2