Merge the 3.8.12 beta changes from trunk.

FossilOrigin-Name: 35b1b8d4b97715030700e37b292bb4f1bb3f44d6

diff --cc manifest
index 794f8813033b5f1d058df0855bc2cd5f0b5c3127,773704bd6cc209091e9aef0aae571327a216a79e..de9d87e9cfb179f3237f7e3ba1affcec93169df6
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Changes\sto\sthe\ssesssions\smodule\sensure\sthat\stables\sappear\swithin\schangesets\sand\spatchsets\sin\sthe\ssame\sorder\sthat\sthey\swere\sattached\sto\sthe\ssessions\sobject.
- D 2015-10-01T16:35:57.175
 -C Remove\stwo\sunused\slines\sof\scode\s-\sdiscovered\sby\sscan-build.
 -D 2015-10-08T02:44:42.485
++C Merge\sthe\s3.8.12\sbeta\schanges\sfrom\strunk.
++D 2015-10-08T14:55:30.090
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2143eeef6d0cc26006ae5fc4bb242a4a8b973412
 +F Makefile.in fdcfdc361f0a3723da9b48b967f259f7aaff3ad5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc b9054642ab305be4174d8b0433c9951c2839701d
 +F Makefile.msc 2f913bc2229596a31ec1025ce34aef9634164a6a
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -360,12 -343,12 +363,12 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c e49f4af9748c9e0cc1bf864b4190aa94841c8409
+ F src/select.c 2c4bfdf7c797df9b43121ed7850bf939b6f27405
 -F src/shell.c dfd18e56fcb88dd79378774e9bc3246a9bd52243
 -F src/sqlite.h.in 4b76d74d69af48c534c58fb723137dc6944bdedc
 +F src/shell.c f38cfe6a0b971d50158e71880852119bdca89ce9
 +F src/sqlite.h.in 8f4deb5874227c7635300fb75105ff6e92131fb5
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
- F src/sqliteInt.h a6edcbabcd78cfd888f74aaedb2160241a38294f
 -F src/sqliteInt.h e21cc96bc24161df7373f6b24367cf580496889d
++F src/sqliteInt.h 4150e72a668204fbcbdfbcc5f44c9aa5151663f8
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -423,16 -406,16 +426,16 @@@ F src/update.c 9e102cc3d8732aeb6b977569
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c b61897b3e827e600f2a773031326471e49205fa5
 -F src/vdbe.c 1e0bf8d6a2308ce916d444ef399921407fd5d972
 -F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
 -F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 -F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
 -F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
++F src/vdbe.c fd0fba1ba0d117a65f16252d38083fa17eb9c44a
 +F src/vdbe.h 67151895e779b35475c6c11b16be2ceb839066c8
 +F src/vdbeInt.h 42fa34502937071aabd3c0596575ba9776547353
 +F src/vdbeapi.c f5eda36a5c85ef578957ab4311e8d9b1f51a3552
 +F src/vdbeaux.c 4cbd4cc79dad0e2c2b9996ae018d79a7330110f4
 +F src/vdbeblob.c b400c25ac822af3c507ef84b5cd93c1583a70321
 +F src/vdbemem.c 28ab8455ac490373798cf2c21def2c1287942551
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
- F src/vtab.c 9a6d8818c8a2477ce547f064701b5e955b25d894
+ F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
  F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
@@@ -1410,7 -1390,7 +1411,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 b2face9aa95ade96a5666c70b6b31064c1ad0977
- R 67f4bc03b9ceb2707f867778f6790d70
- U dan
- Z c3622f418cca20fcda99ae888e36e276
 -P 83dc1ff7fa010715ca7f406a572f4ee444a967d7
 -R 23aa9f023fe3604f2c01d6814f9077e1
++P 7695890230dc1e0c6db9b7aa509db2039c7f7239 77b707b77496a08703fe9405e8e4521a4e5b419e
++R 484e6e15f7bc3708de45fd25742a1667
+ U drh
 -Z 20dd7ef754329d35cfe6df88eb2905f9
++Z 02c522f97e4db3ce71ca22576dc5b408

diff --cc manifest.uuid
index 5274d2fafab92ba9b87abf6284ff7e0808b9169b,f50ffd68a431319968f6fba679d483801e88bac0..03f88e0e6a2784fe10f77c5b0ee3666713061dce
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7695890230dc1e0c6db9b7aa509db2039c7f7239
 -77b707b77496a08703fe9405e8e4521a4e5b419e
++35b1b8d4b97715030700e37b292bb4f1bb3f44d6

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge