From: dan <dan@noemail.net>
Date: Mon, 15 Sep 2014 16:57:10 +0000 (+0000)
Subject: Merge latest trunk fixes into this branch.
X-Git-Tag: version-3.8.11~252^2~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1af32e83ca9fbefe7c49b36242c26c116d4f9bcd;p=thirdparty%2Fsqlite.git

Merge latest trunk fixes into this branch.

FossilOrigin-Name: 5efafef51d146bcba3adc425561bfa1ac083c0a7
---

1af32e83ca9fbefe7c49b36242c26c116d4f9bcd
diff --cc manifest
index 84eb7631bb,44c6f5bfa6..e463fef402
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
- D 2014-09-15T15:34:31.844
 -C Fix\stool/showwal.c\sso\sthat\sit\shandles\sWAL\sfiles\sthat\scontain\s64KiB\spages.
 -D 2014-09-15T16:53:23.593
++C Merge\slatest\strunk\sfixes\sinto\sthis\sbranch.
++D 2014-09-15T16:57:10.623
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -299,13 -293,13 +299,13 @@@ F src/vdbe.h c63fad052c9e7388d551e556e1
  F src/vdbeInt.h b4843c35c3ba533b69d4250f550b5bacf2fb013d
  F src/vdbeapi.c 06b712d4772b318b69cd37a416deb1ff0426aa8c
  F src/vdbeaux.c 91fd1e0c54a765838dc61fcf79f31acce035ce38
 -F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
 +F src/vdbeblob.c a8e2c3baa3e7081347c4677185a631bfc43de043
  F src/vdbemem.c dc36ea9fe26c25550c50085f388167086ef7d73a
- F src/vdbesort.c 36ac09004c2ca57486ba3d1f4ac5d0d62257b136
+ F src/vdbesort.c a7a40ceca6325b853040ffcc363dcd49a45f201b
  F src/vdbetrace.c 16d39c1ef7d1f4a3a7464bea3b7b4bdd7849c415
  F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
 -F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 6f5ff51117293e7b2c75ad21834f51115e59ea96
 +F src/wal.h 237bc4484f7c289f094ecb6efb2b6c02005484e1
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
  F src/where.c 839b5e1db2507e221ad1c308f148a8519ed750be
  F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
@@@ -1203,7 -1198,7 +1204,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 79f2418429aa05c56069c56d51b4d72f662a6970 69a64560777f85b47349b4b2aab01dc99298592e
- R 10cbf38158f2f089e176ffb2e809ade0
 -P dedaa6fb3d2e6e697d4a48649af5f42d9a11c333
 -R 9c897c2b35082efdf1b1cdba3d9a6e48
++P 55b8011d5b455927f5b92a3cb911fd909fb0edab 4060efb646c873c4abde7ab9ddf330489a44f274
++R a8de04acab3d1132246bf5d89e41e027
  U dan
- Z c612131a6abb7d1e449d4f88a8b72de0
 -Z fbf2bdf01c7200ebedc4b699448a8435
++Z 1d00f387d17c6184cf9c7c454dc66aca
diff --cc manifest.uuid
index 69d84cda00,f4f07abe9e..607c43815f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 55b8011d5b455927f5b92a3cb911fd909fb0edab
 -4060efb646c873c4abde7ab9ddf330489a44f274
++5efafef51d146bcba3adc425561bfa1ac083c0a7