From: drh <drh@noemail.net>
Date: Sun, 20 Feb 2011 21:03:04 +0000 (+0000)
Subject: Pull in the fix to STAT2 processing from check-in
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=320cebe7d1e3390d444696a2f224628608e80bef;p=thirdparty%2Fsqlite.git

Pull in the fix to STAT2 processing from check-in
[70a3d81742f].

FossilOrigin-Name: 692aafb17e7fca4e303ca14da2925cb95a22f71e
---

diff --git a/manifest b/manifest
index 8a76bc2768..d2291939a1 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Do\snot\sreport\sthe\sdatabase\scorruption\sif\sthe\sthe\sdb\ssize\sheader\sfield\sis\s\ngreater\sthan\sthe\sfile\ssize\son\sdisk\sunless\sthe\stwo\schange-counter\sheader\nfields\sare\sidentical.\s\sFix\sfor\sticket\s[89b8c9ac54].\s\sBackport\sby\scherrypick\nof\s[00c4596f0b270].
-D 2011-02-20T03:40:59.226
+C Pull\sin\sthe\sfix\sto\sSTAT2\sprocessing\sfrom\scheck-in\n[70a3d81742f].
+D 2011-02-20T21:03:04.537
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -243,7 +240,7 @@ F src/vtab.c b297e8fa656ab5e66244ab15680d68db0adbec30
 F src/wal.c 5b0f0a2a12208544721b5b46cc18f97efb203ea3
 F src/wal.h c1aac6593a0b02b15dc625987e619edeab39292e
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c fa22d45b2577c77146f2e894d58011d472d64103
+F src/where.c af069e6b53234118014dabfece96a9515b69d76b
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 51756962d522e474338e9b2ebb26e7364d4aa125
@@ -897,14 +894,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 442be1358e7dff17548718c0c7c031ec320d135d
-R fb59a5fc0a5e3e6fb0952242e7338186
+P e2616004dfaf61d776e448693971b6478552a635
+R d8e085383636be2d77c988420d503189
 U drh
-Z b5b010b64c2aa9bb6b609fd60a9d673c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFNYI1OoxKgR168RlERAgtNAJ9Ud7Oa/GOufsGai8aQQiHsv4t1TwCePLOJ
-P+9Qab9sXXe3r9JTQY9/ues=
-=z4yR
------END PGP SIGNATURE-----
+Z 0dcddd6d0b789a4a9ef8c5f0f596ab90
diff --git a/manifest.uuid b/manifest.uuid
index 9caa82de01..defd04e6ec 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e2616004dfaf61d776e448693971b6478552a635
\ No newline at end of file
+692aafb17e7fca4e303ca14da2925cb95a22f71e
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index b8d1d6b276..4a5026f5f4 100644
--- a/src/where.c
+++ b/src/where.c
@@ -2315,10 +2315,9 @@ static int valueFromExpr(
   u8 aff, 
   sqlite3_value **pp
 ){
-  /* The evalConstExpr() function will have already converted any TK_VARIABLE
-  ** expression involved in an comparison into a TK_REGISTER. */
-  assert( pExpr->op!=TK_VARIABLE );
-  if( pExpr->op==TK_REGISTER && pExpr->op2==TK_VARIABLE ){
+  if( pExpr->op==TK_VARIABLE
+   || (pExpr->op==TK_REGISTER && pExpr->op2==TK_VARIABLE)
+  ){
     int iVar = pExpr->iColumn;
     sqlite3VdbeSetVarmask(pParse->pVdbe, iVar); /* IMP: R-23257-02778 */
     *pp = sqlite3VdbeGetValue(pParse->pReprepare, iVar, aff);