From: drh <drh@noemail.net>
Date: Thu, 28 Aug 2014 13:42:13 +0000 (+0000)
Subject: Fix a formatting error ("%d" needed in place of "%g") on a WHERETRACE
X-Git-Tag: version-3.8.7~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5418b1298faf903bee8aeb55abfba88754f4aee9;p=thirdparty%2Fsqlite.git

Fix a formatting error ("%d" needed in place of "%g") on a WHERETRACE
macro inside of the query planner.  This fix applies to debugging logic
only.

FossilOrigin-Name: c931ca2b7763cf894ece26ca4775d638876107e9
---

diff --git a/manifest b/manifest
index 3e0e010c17..acc19cfe1f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refactor\sthe\ssqlite3PcacheFetch()\sroutine\sinto\sthree\sseparate\sroutines,\nwhich\sare\ssignificantly\sfaster\soverall\sand\sabout\s100\sbytes\ssmaller\sin\nsize\sas\swell.
-D 2014-08-27T23:18:01.324
+C Fix\sa\sformatting\serror\s("%d"\sneeded\sin\splace\sof\s"%g")\son\sa\sWHERETRACE\nmacro\sinside\sof\sthe\squery\splanner.\s\sThis\sfix\sapplies\sto\sdebugging\slogic\nonly.
+D 2014-08-28T13:42:13.503
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -297,7 +297,7 @@ F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
 F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c b80cb72645390ba6d8b715a47f5696d27b4fc6c9
+F src/where.c 2fd5cfaf260d020e87053be8fb3741782c941adc
 F src/whereInt.h 923820bee9726033a501a08d2fc69b9c1ee4feb3
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1188,7 +1188,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 029a6dc744c24e7be482298c678af8a115d6a87b
-R dd4d11ad7a65bf573cc08ce3e7bd3aa7
+P bdb6e4978d1a26d5f795262172605184264ede9c
+R 34004330a355f02374768ce4f339cc8f
 U drh
-Z c0c64dee6940e13662884c6ed139ac1a
+Z aa80dcf0253dbc225958d679762190fc
diff --git a/manifest.uuid b/manifest.uuid
index 64c260eec0..dda8ba50bd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bdb6e4978d1a26d5f795262172605184264ede9c
\ No newline at end of file
+c931ca2b7763cf894ece26ca4775d638876107e9
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 22dfd0d0fa..656b6ea590 100644
--- a/src/where.c
+++ b/src/where.c
@@ -2390,7 +2390,7 @@ static int whereInScanEst(
   if( rc==SQLITE_OK ){
     if( nRowEst > nRow0 ) nRowEst = nRow0;
     *pnRow = nRowEst;
-    WHERETRACE(0x10,("IN row estimate: est=%g\n", nRowEst));
+    WHERETRACE(0x10,("IN row estimate: est=%d\n", nRowEst));
   }
   assert( pBuilder->nRecValid==nRecValid );
   return rc;