From: dan <dan@noemail.net>
Date: Fri, 17 Nov 2017 13:21:12 +0000 (+0000)
Subject: Do not count temporary databases that have been attached using ATTACH when
X-Git-Tag: version-3.22.0~193
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7775e4a2b49e5d5f5041a7008462f06ff77d4ce4;p=thirdparty%2Fsqlite.git

Do not count temporary databases that have been attached using ATTACH when
figuring out if a master-journal file is required by a transaction.

FossilOrigin-Name: 93e012a317c8a4bfb84327616a597acabfcb24417197eefdccb8031bcf64e0c0
---

7775e4a2b49e5d5f5041a7008462f06ff77d4ce4
diff --cc manifest
index d601661e29,8fa35294e4..103854a9cb
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Ensure\sthat\sempty\sspace\son\spages\sis\szeroed\sbefore\sthey\sare\swritten\sto\sdisk.\nThis\shelps\swith\scompressed\sdatabases,\sand\sstops\svalgrind\scomplaining\sabout\nuninitialized\sbytes\sand\swrite().
- D 2017-11-16T20:48:47.980
 -C Avoid\screating\sa\smaster\sjournal\sif\sall\sor\sall\sbut\sone\sof\sthe\sdatabases\sin\sthe\ntransaction\sis\sa\stemp\sfile.
 -D 2017-11-17T08:20:10.452
++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
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc a55372a22454e742ba7c8f6edf05b83213ec01125166ad7dcee0567e2f7fc81b
@@@ -1677,7 -1677,10 +1677,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P e0b5c0585e8530bd516b340093a46d8e358a731facb78da22d3208633c852804
- R a54da776e28f1875d13b67b86731a30b
 -P 5ffec5db33137251090d45e2ca7e3e7823e3215ae89822d905923424ceba2ac2
++P 5ffec5db33137251090d45e2ca7e3e7823e3215ae89822d905923424ceba2ac2 355d1232fd7314723afaa8d6b8b73506b09cbba1113a88b10204ba89be993508
+ R 549acd152a27430f44fc7371aab0d342
 -T *branch * master-journal-temp-files
 -T *sym-master-journal-temp-files *
 -T -sym-trunk *
++T +closed 355d1232fd7314723afaa8d6b8b73506b09cbba1113a88b10204ba89be993508
  U dan
- Z 4bb1ae38bdfadd3dc2e110f3406150e8
 -Z adbdc7db93ebd9a4eb2724ff9604ae84
++Z eb504c2f876fdf46c1053782d9bac493
diff --cc manifest.uuid
index 39825a308f,52e9077fed..39dbcda631
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5ffec5db33137251090d45e2ca7e3e7823e3215ae89822d905923424ceba2ac2
 -355d1232fd7314723afaa8d6b8b73506b09cbba1113a88b10204ba89be993508
++93e012a317c8a4bfb84327616a597acabfcb24417197eefdccb8031bcf64e0c0