Merge further enhancements to the batch-atomic-write subsystem.

FossilOrigin-Name: 4be4265d74b8a46f6b0b0d9108efb1d2a3fb197d902bac1238e1ee03125f975a

diff --cc manifest
index 9bdb79b37e7416047d2908c0ecc46064cb4fbdb7,351fec852372d85627a4aaaea9f90e0468399ae4..aa97b2ba9cfa0c676c3cd417efe84f3b83975406
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Backport\sof\sall\sbatch-atomic-write\schanges\sthrough\scheck-in\n[67bad7fb9b]
- D 2017-07-28T02:02:45.191
 -C Disable\sthe\swritecrash.test\smodule\son\sWindows.
 -D 2017-07-28T20:49:02.901
 -F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
++C Merge\sfurther\senhancements\sto\sthe\sbatch-atomic-write\ssubsystem.
++D 2017-07-31T12:04:23.686
 +F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
 -F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
 -F VERSION 87f1498f27e398bce3da2fa8125c9879a38ed9d87e4b5fb922b351de1e25cadb
 +F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
 +F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
 +F VERSION 6035ef7e627075d9a9194304c3a07acb2736a0abd0dd980a7ea75a3a45719e86
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -387,28 -436,29 +387,28 @@@ F src/os.c add02933b1dce7a39a005b00a2f5
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c 9aa19db965d574cbaf74405cd51c58b87fdbfe045b8bbfc01b18bdeeda3c4305
+ F src/os_unix.c 0681c6ef336fcb6a111f45b60a5faea38992ed6c4ae9fbd57a6f8e247724fa68
  F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 1e63b0299cf123cf38c48413ec03190f56c1e7d0ccc6573c467d8ac240b898e9
 +F src/pager.c 930dace8819cf569331bca24be8fe362d337208bc6e12dc4acb19c596630f1f4
  F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
 -F src/parse.y e384cb73f99e1b074085c974b37f4d830e885359e4b60837e30f7d67c16ba65b
 +F src/parse.y 0513387ce02fea97897d8caef82d45f347818593f24f1bdc48e0c530a8af122d
  F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
 -F src/pcache.h 521bb9610d38ef17a3cc9b5ddafd4546c2ea67fa3d0e464823d73c2a28d50e11
 +F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
  F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
 -F src/pragma.c cd6aeda3587be6c5c08f9b2d45eae6068666a03c9d077c8c43cdb85fb0aa70f2
 -F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
 -F src/prepare.c dd250f904739b1dc449c131ac527c35e3424d94082dd111321bd83f80c6bb0fe
 +F src/pragma.c 2362670a9d28b71708aecb2b9b10b3f7be71f4c950961c07e81dc400e3ce6371
 +F src/pragma.h 37a1311d0388db480388d7ec09054f7103045eff20d4971f8a433b77f40b9921
 +F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
  F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 -F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
 +F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 -F src/select.c c6bf96a7f9d7d68f929de84738c599a30d0a725ab0b54420e70545743cd5ee7b
 -F src/shell.c bd6a37cbe8bf64ef6a6a74fdc50f067d3148149b4ce2b4d03154663e66ded55f
 -F src/shell.c.in b5725acacba95ccefa57b6d068f710e29ba8239c3aa704628a1902a1f729c175
 -F src/sqlite.h.in 91ebe5f8b4e6595325110fb23efe6cc70dfe53d394d2dd31c8b6cdf6a98325e0
 +F src/select.c c444ca057d48cf1a4eb8f6a58fbc13418a7f83ae94a6bd6f29f7ad6c704a9e4c
 +F src/shell.c a37d96b20b3644d0eb905df5aa7a0fcf9f6e73c15898337230c760a24a8df794
- F src/sqlite.h.in d603987eee5f7a2fa81d4baf5ec70b67b214bd34f7e1819653f5ec3b9c982eee
++F src/sqlite.h.in aa1bccab835fbea701599ffc747d2fed9098142b9b52e714229d7789a140ad25
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 -F src/sqlite3ext.h 967154985ed2ae62f90d9029bb5b5071793d847f1696a2ebe9e8cc0b042ae60b
 -F src/sqliteInt.h 3cbbcb67ba66ffe44a6768c95df22137335e9ef167d5da93bf0c1ed20a91b992
 +F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
 +F src/sqliteInt.h 40785f84fc3d3b25b54f4325d42992f41a73e81de57b354271bd2de0ae377625
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -522,7 -572,8 +522,8 @@@ F test/async3.test d73a062002376d7edc1f
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
  F test/async5.test 383ab533fdb9f7ad228cc99ee66e1acb34cc0dc0
  F test/atof1.test ff0b0156fd705b67c506e1f2bfe9e26102bea9bd
 -F test/attach.test f4b8918ba2f3e88e6883b8452340545f10a1388af808343c37fc5c577be8281c
+ F test/atomic.test 065a453dde33c77ff586d91ccaa6ed419829d492dbb1a5694b8a09f3f9d7d061
 +F test/attach.test 9976867b1a6585018f0966857aa82ed44e0bd6dc
  F test/attach2.test 0ec5defa340363de6cd50fd595046465e9aaba2d
  F test/attach3.test c59d92791070c59272e00183b7353eeb94915976
  F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
@@@ -1581,10 -1639,7 +1582,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 24c9cd460051781f7e6417b7e205274319258f061ae1191a6c5ff5af615439c9 67bad7fb9b2fdb29b63308f22062444084dc28191a542e08076dc2e39caf6f62
- R 52d5da1e6c65e285a15752ad8c60b72a
- T *branch * batch-atomic-write-3.19
- T *sym-batch-atomic-write-3.19 *
- T -sym-branch-3.19 *
 -P 6a505bdd9347783d3d8105cb8185aa787801bad0c855b623cfd780fb406f0e7b
 -R a1d9f1b06fb7a9cab059484be0d2ec0b
++P def55027b1f1db9c083830019dbcc3daed94f6cc70a76b285ac1af9d82f81695 4c0520d4df7473eb4cc764774df7d99bb96cf067ac224755e09f0df47fb2a810
++R c14b6d047504c900d55e0fc810341b46
  U drh
- Z db5307b269591715fdc95cf9a91a4aa8
 -Z f25cf82f472085f11871c2d253c31dfe
++Z 7e0e256b705f62a9caed770611838ecb

diff --cc manifest.uuid
index 65256a71e995a15c5db1c813aa0afd2e4f9cb2b2,ba62037fe018160432782cef6b80b8561dcaf9dc..5a53ac178259561de3a14a192aef9e171ad548d2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- def55027b1f1db9c083830019dbcc3daed94f6cc70a76b285ac1af9d82f81695
 -4c0520d4df7473eb4cc764774df7d99bb96cf067ac224755e09f0df47fb2a810
++4be4265d74b8a46f6b0b0d9108efb1d2a3fb197d902bac1238e1ee03125f975a

diff --cc src/sqlite.h.in
Simple merge