Fix a potential problem in the whereRangeScanEst() routine when STAT4 is

active.  The problem was introduced by recent enhancements.

FossilOrigin-Name: 68e1b4de700b5291f79249a03e1a750c6b2c9ae4

diff --git a/manifest b/manifest
index 1d67001ce99d871aa789252103fc61c30efd1036..a49120ba19489e1b088f09d6b25335dc490722c5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cause\sthe\scommand-line\sshell\sto\sreturn\snon-zero\sif\sthe\sfinal\sSQL\sstatement\nis\sincomplete.
-D 2014-10-10T13:08:33.966
+C Fix\sa\spotential\sproblem\sin\sthe\swhereRangeScanEst()\sroutine\swhen\sSTAT4\sis\nactive.\s\sThe\sproblem\swas\sintroduced\sby\srecent\senhancements.
+D 2014-10-10T15:01:46.922
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -302,7 +302,7 @@ F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
 F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
-F src/where.c 6fe21e0f60a449af5d75d00e6d480370464a9a48
+F src/where.c d1e315e338f51e4e7ff83ac6231a81d1c0cd30f9
 F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1203,7 +1203,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 49dfee7cd1c9ab2901b8a871a6cd00b2ead76801
-R cb2ddf412f0df2d20c53503ae15115d8
+P 177fff3b98b101b98f1e7d334b6a80530b645565
+R 07357edada657f8492081fa01ca31a82
 U drh
-Z 473a503ca2f65e4944005f1668696768
+Z a44558a0f7d62314eeda3bb13a5723b9

diff --git a/manifest.uuid b/manifest.uuid
index 20fdb6bf5a52e27880712cbafe42411821df9ad4..dc8efe95322593ed529127456baa09e94514642b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-177fff3b98b101b98f1e7d334b6a80530b645565
\ No newline at end of file
+68e1b4de700b5291f79249a03e1a750c6b2c9ae4
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 011ad66c00ef2802ae9f7806834282167685e043..e3ab542525b32ec8827db774b96f31cc340ff4c6 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -2209,8 +2209,8 @@ static int whereRangeScanEst(
 
       assert( pLower==0 || (pLower->eOperator & (WO_GT|WO_GE))!=0 );
       assert( pUpper==0 || (pUpper->eOperator & (WO_LT|WO_LE))!=0 );
-      assert( p->pKeyInfo!=0 && p->pKeyInfo->aSortOrder!=0 );
-      if( p->pKeyInfo->aSortOrder[nEq] ){
+      assert( p->aSortOrder!=0 );
+      if( p->aSortOrder[nEq] ){
         /* The roles of pLower and pUpper are swapped for a DESC index */
         SWAP(WhereTerm*, pLower, pUpper);
       }