From: drh <drh@noemail.net>
Date: Mon, 17 Feb 2014 15:36:39 +0000 (+0000)
Subject: Merge the VDBE_PROFILE fixes from trunk.
X-Git-Tag: version-3.8.4~64^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7591051a73d7257550a8ad410fd4a94db1195b55;p=thirdparty%2Fsqlite.git

Merge the VDBE_PROFILE fixes from trunk.

FossilOrigin-Name: 2914e4191121004a3f564b1fbf1c235dcc595503
---

7591051a73d7257550a8ad410fd4a94db1195b55
diff --cc manifest
index 4d28d8ab47,567cd67cd1..3a3470f9c7
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\sunnecessary\scalls\sto\sapplyAffinity()\sduring\sINSERT\sand\sUPDATE\noperations,\sespecially\sfor\stable\sthat\shave\sindices\sand\stables\sfor\swhich\nall\scolumns\shave\saffinity\s"NONE".
- D 2014-02-17T14:59:22.345
 -C Fix\sthe\sVDBE_PROFILE\slogic.\s\sAdd\sa\sscript\sto\sprocess\sthe\soutput\sfile.
 -D 2014-02-17T01:13:28.650
++C Merge\sthe\sVDBE_PROFILE\sfixes\sfrom\strunk.
++D 2014-02-17T15:36:39.392
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1150,7 -1151,7 +1151,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P aa2d8b0e8154dd2f5e2c837dc11ab362b083495b
- R 76ffa4a9c63f5b066cf1aa1863fa3f56
 -P e07a32f30862acf3b322d4d8deb015846d6f8f5f
 -R a089b7b7dc577bc47ffd22f19eb9e985
++P 35b4d6e938164fabaf30b504c54cfd9a69060cee 7adb3da235c8c162c84f05ef4ccf1cc463805d5f
++R 2b995c2f8f9fb3c739cf787130cc4e23
  U drh
- Z c57e89c4432511b9873eed17e1f87e02
 -Z f101c06fe6a48199aebfe3f4c9baeea7
++Z a75f767ce30ab2f817d9dd9884981718
diff --cc manifest.uuid
index f218979de8,79ba90c802..5178dd9e5a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 35b4d6e938164fabaf30b504c54cfd9a69060cee
 -7adb3da235c8c162c84f05ef4ccf1cc463805d5f
++2914e4191121004a3f564b1fbf1c235dcc595503