In the index_list pragma, make sure the "r" column is the same on output

as it was on input in the sqlite_stat1 table.

FossilOrigin-Name: de78250ad2a6210dd4f03045248f7192d64427f2

diff --git a/manifest b/manifest
index 785d3f86cc230591713374c4a53a64288c5837ef..ae084022a8a410616e399183f734bf7afa88e9f6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\schanges.
-D 2013-10-04T20:39:44.163
+C In\sthe\sindex_list\spragma,\smake\ssure\sthe\s"r"\scolumn\sis\sthe\ssame\son\soutput\nas\sit\swas\son\sinput\sin\sthe\ssqlite_stat1\stable.
+D 2013-10-05T02:56:25.653
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -210,7 +210,7 @@ F src/parse.y a97566d6da75075589a7c716d1bda14b586cf8da
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
 F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
 F src/pcache1.c a467393909a4ed7ca9de066d85ba5c5b04a5be63
-F src/pragma.c 3bcdc7a98ad9429218179d2d81fc4aa9e39d8592
+F src/pragma.c 07814efdbf815356dafd4bfa4c21f527edbb0150
 F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
 F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b
 F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
@@ -1121,7 +1121,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P e5d9371da92b4cc2c1df177cf40e0ced4d4c7421 087af29ee2e1572f8668dd0152a14d7f9796a530
-R 838bbc74cdb0ef42bd304761cfe55c8f
+P c6ac80ed8d5240dd30783d62d9f133e159809dec
+R c9cf5017e54db6d924fbbb210ed0508a
 U drh
-Z cee568528af628e5a352dc111e7dd8d1
+Z 19a867121626a8f2aac930a5af209c29

diff --git a/manifest.uuid b/manifest.uuid
index 14406b3890323e58fff3d4d9b5f302715ed72aad..6435c4935505f48ceae7d20745993399843d5230 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c6ac80ed8d5240dd30783d62d9f133e159809dec
\ No newline at end of file
+de78250ad2a6210dd4f03045248f7192d64427f2
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index a0f49b908046d947797a1b38f57f7b464d720dfe..940402bb68d5363775fc33753fe7d66343cb7882 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1466,7 +1466,7 @@ void sqlite3Pragma(
           sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
           sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, pIdx->zName, 0);
           sqlite3VdbeAddOp2(v, OP_Integer, pIdx->onError!=OE_None, 3);
-          sqlite3VdbeAddOp2(v, OP_Integer, pIdx->iScanRatio*100/128, 4);
+          sqlite3VdbeAddOp2(v, OP_Integer, (pIdx->iScanRatio*100+127)/128, 4);
           sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 4);
           ++i;
           pIdx = pIdx->pNext;