From: dan <dan@noemail.net>
Date: Mon, 10 Sep 2018 19:27:12 +0000 (+0000)
Subject: Fix a minor problem causing an incorrect cursor-hint to be generated in some
X-Git-Tag: version-3.25.0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be312ae9fd73f9b6d6daa704966e7a6f43261256;p=thirdparty%2Fsqlite.git

Fix a minor problem causing an incorrect cursor-hint to be generated in some
cases.

FossilOrigin-Name: d879c47d7d145cbe99602b2cf70294ddc946709e8d61040942085d29e2c5b6cd
---

diff --git a/manifest b/manifest
index f31edbc965..1c8329ccc5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sability\sfor\sloadable\sextensions\sto\saccess\sthe\snew\nsqlite3_create_window_function()\sinterface.
-D 2018-09-10T17:21:17.125
+C Fix\sa\sminor\sproblem\scausing\san\sincorrect\scursor-hint\sto\sbe\sgenerated\sin\ssome\ncases.
+D 2018-09-10T19:27:12.947
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
@@ -588,7 +588,7 @@ F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c ba7225773931760cf60bf22f34d0cce2588df7ce5ce0f215a52eb88234b55ac4
 F src/where.c 2019126801437944c38cc62a99491e98591460b7cc07ab57eb66165f710a289b
 F src/whereInt.h b90ef9b9707ef750eab2a7a080c48fb4900315033274689def32d0cf5a81ebe4
-F src/wherecode.c 2b6cd1b27736cc803060289e04ecf9849976106f4077aa67d1a2c0e3ec420159
+F src/wherecode.c c1fa3f6fc8fa0dc3c4a37288b4fad6103cb38f86bd0cfeca87d8928b2ef75cd5
 F src/whereexpr.c eb462ebe085f6cbb6bdda797a041fbd7e3724586203344043d1088a2117d8e44
 F src/window.c 4b503da928dace3e845b891381a4d98eeb8c5744313ae3643df8d8d21fdcca65
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1765,7 +1765,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 564fa75195c5179d0bc86431aaff06136fc65ec63aa9839cd1114b1fbfac928b
-R 378f55550174254d53e685434c10d1be
-U drh
-Z ac0cc4f389162f55ed4c845b7b8f2a22
+P 3def6d8ef11702eb03ad56aeb01763ec8e4ca8ed3b570ffb680164c5c3679e4f
+R 17d3aa2f0ff36b5d953bee62d9f5a9cb
+U dan
+Z 415de3c8b986f591f4f84d497a0d28d9
diff --git a/manifest.uuid b/manifest.uuid
index 14e42e7e54..3fe8bcc1e7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3def6d8ef11702eb03ad56aeb01763ec8e4ca8ed3b570ffb680164c5c3679e4f
\ No newline at end of file
+d879c47d7d145cbe99602b2cf70294ddc946709e8d61040942085d29e2c5b6cd
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index 6b819da662..82519238aa 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -882,7 +882,7 @@ static int codeCursorHintIsOrFunction(Walker *pWalker, Expr *pExpr){
 static int codeCursorHintFixExpr(Walker *pWalker, Expr *pExpr){
   int rc = WRC_Continue;
   struct CCurHint *pHint = pWalker->u.pCCurHint;
-  if( pExpr->op==TK_COLUMN && !ExprHasProperty(pExpr, EP_FixedCol) ){
+  if( pExpr->op==TK_COLUMN ){
     if( pExpr->iTable!=pHint->iTabCur ){
       Vdbe *v = pWalker->pParse->pVdbe;
       int reg = ++pWalker->pParse->nMem;   /* Register for column value */