From: dan <dan@noemail.net>
Date: Fri, 28 Aug 2015 15:50:24 +0000 (+0000)
Subject: Merge latest trunk into this branch.
X-Git-Tag: version-3.9.0~180^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fwal-read-change;p=thirdparty%2Fsqlite.git

Merge latest trunk into this branch.

FossilOrigin-Name: ab93024da7bd577d8850b417aff8597a8b3807fc
---

8f9ea2dc70cc160b4cae49887aa54b9e1464a22c
diff --cc manifest
index e20dbce225,d07b325859..73cabf2fc4
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C When\ssearching\sthe\swal\sfile\sfor\sa\sframe,\sdo\snot\ssearch\sthat\spart\sthat\swas\salready\scheckpointed\swhen\sthe\ssnapshot\sbeing\sread\swas\sat\sthe\shead\sof\sthe\swal\sfile.
- D 2015-08-13T20:23:46.835
 -C Add\sthe\sjson_check()\sfunction,\swhich\sreturns\sits\sargument\sif\sthe\sargument\nis\swell-formed\sJSON\sor\swhich\sthrows\san\serror\sotherwise.
 -D 2015-08-28T03:48:04.807
++C Merge\slatest\strunk\sinto\sthis\sbranch.
++D 2015-08-28T15:50:24.380
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 2fc9ca6bf5949d415801c007ed3004a4bdb7c380
+ F Makefile.in e2218eb228374422969de7b1680eda6864affcef
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 5f7861c62c41fe8e3205ef14b90ebed28fa21f1b
+ F Makefile.msc 10af19cc089862481d49b347acd99c02635ddc49
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -406,15 -409,15 +409,15 @@@ F src/vdbeblob.c 4f2e8e075d238392df98c5
  F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
- F src/vtab.c 082b35a25a26e3d36f365ca8cd73c1922532f05e
+ F src/vtab.c d31174e4c8f592febab3fa7f69e18320b4fd657a
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 6fb6b68969e4692593c2552c4e7bff5882de2cb8
 +F src/wal.c 8cd07f1f99e1a81346db1c9da879bef6c6f97cf6
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
- F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c c745d3aa78ad1aa8982febb99f2f17ee5cbac069
- F src/whereInt.h 5f87e3c4b0551747d119730dfebddd3c54f04047
- F src/wherecode.c 5da5049224f12db314931ae7e0919b4914a2a0b1
- F src/whereexpr.c 9ce1c9cfedbf80c93c7d899497025ec8256ce652
+ F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
+ F src/where.c 91e73ffc699c140a59baa03a6b7b060db02bed81
+ F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
+ F src/wherecode.c 3d9113cc307ffeed58db41fe9f2d807c94787ab5
+ F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1372,7 -1380,7 +1380,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 5669ac4a40429abc3f44540fc9d2f3b79b404bdf
- R 0be4044b3773f95bd61300112256d197
 -P 44f103d8862abc2d5613bac04dc2ea8e625b1f40
 -R 204205d2daf18b22608467b1b10a8a77
 -U drh
 -Z 4f534e8322ceee4fbcec765d09d17add
++P 90760e72327eb0593cbfa6d7058b554198cd8044 64abb65d4df11e5b3bcc4afc8e7c18e907c6080a
++R 3ba2e96fe96df838d1a765a1a1eb0bee
 +U dan
- Z f0c98bb462164518b46029fee8374b58
++Z 02ca44698a97dd7951c000949bcfadcd
diff --cc manifest.uuid
index 84745b0a24,49f83f8b9f..789cc49772
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 90760e72327eb0593cbfa6d7058b554198cd8044
 -64abb65d4df11e5b3bcc4afc8e7c18e907c6080a
++ab93024da7bd577d8850b417aff8597a8b3807fc