From: drh Date: Thu, 7 Aug 2014 20:25:37 +0000 (+0000) Subject: Remove the extraneous debugging printf() from the previous check-in. X-Git-Tag: version-3.8.6~25^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b28ce65f45ef4fabef86e0fc1dc55a211ca8d191;p=thirdparty%2Fsqlite.git Remove the extraneous debugging printf() from the previous check-in. FossilOrigin-Name: 8f04d2c0084afa6381e78847c9aa296498d448cb --- diff --git a/manifest b/manifest index 1e4aea7641..833fa0e284 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C When\sthe\sestimated\scost\sto\sdo\sa\ssort\soverwhelms\sthe\sestimated\scost\sto\sdo\nindividual\stable\slookups,\smake\ssure\sthat\sthe\stable\slookup\scosts\sare\sstill\ntaken\sinto\sconsideration\swhen\sselecting\sthe\slookup\salgorithm. -D 2014-08-07T16:50:00.581 +C Remove\sthe\sextraneous\sdebugging\sprintf()\sfrom\sthe\sprevious\scheck-in. +D 2014-08-07T20:25:37.284 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -296,7 +296,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45 -F src/where.c 5a099c6d2a1bfbf46bc64979e89330dee3a1f3b9 +F src/where.c 5e4fe929798e75f9d5c6b5b9c545fbc006966c33 F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 @@ -1185,7 +1185,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 bcf6d775f90f4d1ba018a1b965f2f710df130f01 -R da285ec7c1bbef437389fa691998cee0 +P ec5d84ba69c100d9565425ed74040a49e410ea03 +R 85fb26fb0f7344228780016c4074b483 U drh -Z 083887f7ebac8cb5fec0c6d1cdc7c751 +Z 218dd74820a0f9854df8a36e666b7aca diff --git a/manifest.uuid b/manifest.uuid index 04f61bd019..4e34981ca6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ec5d84ba69c100d9565425ed74040a49e410ea03 \ No newline at end of file +8f04d2c0084afa6381e78847c9aa296498d448cb \ No newline at end of file diff --git a/src/where.c b/src/where.c index ff65cc3b36..ff50f52b45 100644 --- a/src/where.c +++ b/src/where.c @@ -5547,7 +5547,6 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){ } if( jj>=nTo ){ /* None of the existing best-so-far paths match the candidate. */ -if( nTo>=mxChoice && rCost==mxCost ) printf("nOut=%d mxOut=%d\n", nOut, mxOut); if( nTo>=mxChoice && (rCost>mxCost || (rCost==mxCost && nOut>=mxOut)) ){