Fix a problem in STAT4 equality estimation for multi-column indexes

introduced by check-in [3e0590dee0e68cc1599].

FossilOrigin-Name: cfb0d9e0207128b1c2b48689288a849b19dbc00a22cfaca26eec4bfc773629f8

diff --git a/manifest b/manifest
index abcd89965d2c5389172be30d1f276b56996f3b61..8460090227b33b34c3469af8867455fc0fae14a5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\smsvc.h\sheader\sfile\sfrom\sthe\sautoconf\starball.
-D 2017-05-23T20:00:00.761
+C Fix\sa\sproblem\sin\sSTAT4\sequality\sestimation\sfor\smulti-column\sindexes\nintroduced\sby\scheck-in\s[3e0590dee0e68cc1599].
+D 2017-05-24T04:18:00.887
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -485,7 +485,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 F src/walker.c b71a992b413b3a022572eccf29ef4b4890223791
-F src/where.c ba36d01178f5957523cc600b95173057ae9a13ab378b4fc6ab5e14776767057b
+F src/where.c 67f98714b07ec3c1d5e033a63d23c0fd70c24861b7b46b69b10700f22dca6ffe
 F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
 F src/wherecode.c 8ad48867660519e262a401720845dc76934f86f558ec9606335fafcd7a2554f8
 F src/whereexpr.c e913aaa7b73ffcce66abcea5f197e2c538d48b5df78d0b7bba8ff4d73cc2e745
@@ -1581,7 +1581,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 4440e42031b9cb0edf9a8621cd4f46f209392940ec5b9eefcf8c1e3fef5f7b76
-R fb59f13fa3b8cd29e82854e1d83a11ab
+P 84996aef68adeabc8bd97cad269188c67de628f776337a25ec2d63bc956cee78
+R 6e44d308209c1ee6fd92ede1fa3c20ad
 U drh
-Z f39a09afcf102ece6629f66d0c94075e
+Z 52c3cfbe76fd96e0785158bdfa7a1419

diff --git a/manifest.uuid b/manifest.uuid
index 2d4b571b43b89377095f302682357e0214b2d5f8..999052c99e5879f8018e9a192406bba61c65788d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-84996aef68adeabc8bd97cad269188c67de628f776337a25ec2d63bc956cee78
\ No newline at end of file
+cfb0d9e0207128b1c2b48689288a849b19dbc00a22cfaca26eec4bfc773629f8
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index ecac0b0f13015b0bfabf25e097a4076822f5a056..89c4edeb8c3b071b339440bb4f483d17da1f3ec6 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -1192,7 +1192,7 @@ static int whereKeyStats(
       iGap = iGap/3;
     }
     aStat[0] = iLower + iGap;
-    aStat[1] = pIdx->aAvgEq[iCol];
+    aStat[1] = pIdx->aAvgEq[nField-1];
   }
 
   /* Restore the pRec->nField value before returning.  */