From: dan <dan@noemail.net>
Date: Fri, 17 Nov 2017 13:23:44 +0000 (+0000)
Subject: Merge latest changes from trunk, including the temporary db/ATTACH/master-journal... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c69a80d2fa20e791b963df09a20093dee24c8a8;p=thirdparty%2Fsqlite.git

Merge latest changes from trunk, including the temporary db/ATTACH/master-journal fix.

FossilOrigin-Name: 162c7543654c79138b94c3f631d0e4fa6cc77360574a5bb44695bf3333a0eaa0
---

9c69a80d2fa20e791b963df09a20093dee24c8a8
diff --cc manifest
index 4b14492fa7,103854a9cb..53bc49da3f
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sthe\slatest\schanges,\sand\sthe\sstmtvtab1.test\sfix,\sfrom\strunk.
- D 2017-11-16T19:17:45.977
 -C Do\snot\scount\stemporary\sdatabases\sthat\shave\sbeen\sattached\susing\sATTACH\swhen\nfiguring\sout\sif\sa\smaster-journal\sfile\sis\srequired\sby\sa\stransaction.
 -D 2017-11-17T13:21:12.384
 -F Makefile.in b142eb20482922153ebc77b261cdfd0a560ed05a81e9f6d9a2b0e8192922a1d2
++C Merge\slatest\schanges\sfrom\strunk,\sincluding\sthe\stemporary\sdb/ATTACH/master-journal\sfix.
++D 2017-11-17T13:23:44.351
 +F Makefile.in 28a879888205a67bd3b54c68afa1cd2e939e8ead2179b1177756a101dd1eb86e
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc a55372a22454e742ba7c8f6edf05b83213ec01125166ad7dcee0567e2f7fc81b
 +F Makefile.msc 9e7628ad7d33be39ac041e452e47e648ae3d14afbaaa254096e3a4d1d7c1c653
  F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
  F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -543,11 -539,11 +543,11 @@@ F src/update.c 961bd1265d4d1e5cd65c9a54
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c d01fa6f45bfad3b65fb2490513aa2e0676412c61b4b094340b513cf72c3704a4
  F src/vacuum.c 90839322fd5f00df9617eb21b68beda9b6e2a2937576b0d65985e4aeb1c53739
 -F src/vdbe.c 3393b508d9ad084ffce232a7c53e375ef5ac99b50b685c5131fcdfce97a9d534
 +F src/vdbe.c bdf4118f1194272241feb97fbeebf83aa228ef95287fe6dc2cccc533ef0fc90c
  F src/vdbe.h d50cadf12bcf9fb99117ef392ce1ea283aa429270481426b6e8b0280c101fd97
  F src/vdbeInt.h 1fe00770144c12c4913128f35262d11527ef3284561baaab59b947a41c08d0d9
 -F src/vdbeapi.c 9c670ca0dcc1cd86373aa353b747b26fe531ca5cd4331690c611d1f03842e2a1
 +F src/vdbeapi.c 896c36955ffc31154c258c69330c65830d4b300b779b8f6177d31ddc6bc2a14b
- F src/vdbeaux.c 9521a9364e68edad3c8d05ae63395d076724bed1c878c9b13fab61ada54e7d2a
+ F src/vdbeaux.c b02a1f842c0e916285643b8475b7189f10b76f9e7edb5e2353a913c7980f90b5
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
  F src/vdbemem.c 2ef9e66b301a1e575e32966c4c0fd4844e8eea37a2f02bae78c4f68f50a6ab30
  F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
@@@ -1682,7 -1677,8 +1682,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P adf83060a658aadb935b9315244ce5628ba00a6b6c795e39a8f727e6cec9cbc0 e0b5c0585e8530bd516b340093a46d8e358a731facb78da22d3208633c852804
- R 582acff7673b6555d6c271120564415b
- U drh
- Z 5af37f7876417b7fc257028c47404a3a
 -P 5ffec5db33137251090d45e2ca7e3e7823e3215ae89822d905923424ceba2ac2 355d1232fd7314723afaa8d6b8b73506b09cbba1113a88b10204ba89be993508
 -R 549acd152a27430f44fc7371aab0d342
 -T +closed 355d1232fd7314723afaa8d6b8b73506b09cbba1113a88b10204ba89be993508
++P 85247880a68ab5b7b296a71661b4326250d6ecaa58982e7f8197da52c66dde0a 93e012a317c8a4bfb84327616a597acabfcb24417197eefdccb8031bcf64e0c0
++R 1a79c055aa11299eabdf81f9d9ce7c37
+ U dan
 -Z eb504c2f876fdf46c1053782d9bac493
++Z 54c84aac0c4f53ad3fc0713bd73fcf85
diff --cc manifest.uuid
index f333db3e8f,39dbcda631..44194182e0
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 85247880a68ab5b7b296a71661b4326250d6ecaa58982e7f8197da52c66dde0a
 -93e012a317c8a4bfb84327616a597acabfcb24417197eefdccb8031bcf64e0c0
++162c7543654c79138b94c3f631d0e4fa6cc77360574a5bb44695bf3333a0eaa0