From: drh <drh@noemail.net>
Date: Thu, 2 Jul 2015 18:47:12 +0000 (+0000)
Subject: Merge in the latest enhancements from trunks, especially the use of
X-Git-Tag: version-3.13.0~148^2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bed6de557a5282f92ed5019d5c89129a6ece6bab;p=thirdparty%2Fsqlite.git

Merge in the latest enhancements from trunks, especially the use of
_byteswap_ulong() and similar intrinsics on MSVC.

FossilOrigin-Name: 85ca4409bdca7aee801e9fba1c49a87fabbf2064
---

bed6de557a5282f92ed5019d5c89129a6ece6bab
diff --cc manifest
index 90f135b85c,dfc7d5e26a..1ce4000b84
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\sthe\slatest\senhancements\sfrom\strunk.\s\sThis\smerge\sinclude\sFTS5\nand\sa\snumber\sof\snotable\sperformance\senhancements.
- D 2015-06-30T16:29:59.664
 -C Fix\sharmless\scompiler\swarnings\sand\sone\smacro\sVVA_ONLY\smacro\susage\sissue.
 -D 2015-07-02T16:52:01.447
++C Merge\sin\sthe\slatest\senhancements\sfrom\strunks,\sespecially\sthe\suse\sof\n_byteswap_ulong()\sand\ssimilar\sintrinsics\son\sMSVC.
++D 2015-07-02T18:47:12.801
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in c7566d9d9892f855145cbd28bf176fddf44a98b4
 -F Makefile.in 1f525f24e2d3a4defd0ce819c10980caeec967fe
++F Makefile.in 5f96aa7b5ea06cbc72500e85d64f75f4ecd5ed52
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 1c184a23e55ed4b1781dfa127df295615a6eba0f
 -F Makefile.msc 704da8dafbe56e3a734262d07003f203a7e490b6
++F Makefile.msc 0600e09c21aeb7bff79e6badff56a406f68ced22
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@@@ -267,7 -248,7 +267,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk eedc2e607f56729cdcc4b90d8654dfd472bc5bee
 -F main.mk 8a1aded277e90ea7c10d0100d1a38f980e7d12a1
++F main.mk 574470491635f477235a16df7bd80e1a22a9a282
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -346,12 -327,12 +346,12 @@@ F src/printf.c db11b5960105ee661dcac690
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 2d47554370de8de6dd5be060cef9559eec315005
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 009c6138be8788449d4f911f380d99e8608040e2
+ F src/select.c 7003fe663bc0636b656874440845a85dcbad4ba7
 -F src/shell.c 8af3cced094aebb5f57a8ad739b9dafc7867eed7
 -F src/sqlite.h.in 76d2f5637eb795b6300d9dd3c3ec3632ffafd721
 +F src/shell.c e4ad9031072a6d679b2c69a780014d30db62dc7f
 +F src/sqlite.h.in 876ad21b9a6bb5034db7c44cdebd5df2292a5336
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h be1a718b7d2ce40ceba725ae92c8eb5f18003066
- F src/sqliteInt.h 2c8f1aad45b003a5efd615ac1d12aca83cc8d364
 -F src/sqliteInt.h bc2cb1755150fc0b490d1af23ac2911b03f2f92d
++F src/sqliteInt.h b408931086cdcebb6d70c3561b7fe18efb2d48c9
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -405,17 -386,17 +405,17 @@@ F src/threads.c 6bbcc9fe50c917864d48287
  F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
  F src/treeview.c c84b1a8ebc7f1d00cd76ce4958eeb3ae1021beed
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
 -F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f
 +F src/update.c 24dd6a45b8b3470e62702128ebf11be1f2693145
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c 89bfe78b4610d456ba431a0865309a20acc115f3
+ F src/util.c 075c2878fb698bd387164047ecdf76f6cbacf402
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 5ee4a2bf871418f61d06dc256b9b3a0084b5ec46
 -F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
 -F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
 -F src/vdbeapi.c 6a0d7757987018ff6b1b81bc5293219cd26bb299
 -F src/vdbeaux.c 54bcc56d368b2d0bebc523cff514893156c09daf
 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 -F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
 +F src/vdbe.c 195b32310c7062847a45fda214b32ceb8f8f6ab2
 +F src/vdbe.h d0f8ab919146109d080cde4b0840af9b5fafad4b
 +F src/vdbeInt.h 963c87c4bf8040c0a316ca3e58f8a4888e1fa3c4
 +F src/vdbeapi.c a5d2e8afd53b4f81934f5ca59c04465cd1a6d50d
 +F src/vdbeaux.c d6bfb7b4291bc033283140e21c2da2ce04ef0f78
 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846
 +F src/vdbemem.c 6c9e261d135fc175da2f34e46d60243a19fffb9f
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 082b35a25a26e3d36f365ca8cd73c1922532f05e
@@@ -1384,7 -1364,7 +1384,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 924f471291dfd458307a11819aa640cc1a02ac63 8bfcda3d10aec864d71d12a1248c37e4db6f8899
- R 16211acde3caeef0e3b8268914f32a0d
 -P f022e04343fc166a71b315d5aabbc5cc075a4767
 -R 5c911bb6fc3e16cbfd6e76bce0768816
 -U mistachkin
 -Z 616700ef04b7deb7995d1138c3fd92ed
++P 39936b33b0668aad81aa574d4d74c92b0ddd218a bcc8a75509aafda61feb6dcc074668c79611a662
++R e09654bed267c32e59df855cf5a22b97
 +U drh
- Z 476ef58b2bdb077bbb18b26bb89bdae6
++Z 52c48858632936f2e97d9ccb5e52e5d7
diff --cc manifest.uuid
index 3fe08b1953,e4a6a04493..33db24038d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 39936b33b0668aad81aa574d4d74c92b0ddd218a
 -bcc8a75509aafda61feb6dcc074668c79611a662
++85ca4409bdca7aee801e9fba1c49a87fabbf2064