Backport of all batch-atomic-write changes through check-in

[67bad7fb9b]

FossilOrigin-Name: def55027b1f1db9c083830019dbcc3daed94f6cc70a76b285ac1af9d82f81695

diff --cc manifest
index afe26f8645b36bd76a9c25d23afdd54579e5481a,d19c66231b3e80565afd9215d1e07ab1c86a72b8..9bdb79b37e7416047d2908c0ecc46064cb4fbdb7
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Do\snow\sallow\sthe\sgeometry\sobject\sin\sthe\sright\soperand\sof\sa\sMATCH\soperator\sin\nthe\sRTREE\sextension\sto\sbe\sinpersonated\sby\sa\sBLOB\sliteral.
- D 2017-07-27T00:27:57.692
 -C Add\sthe\sSQLITE_ENABLE_BATCH_ATOMIC_WRITE\smacro\sto\sctime.c
 -D 2017-07-28T01:53:32.480
 -F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
++C Backport\sof\sall\sbatch-atomic-write\schanges\sthrough\scheck-in\n[67bad7fb9b]
++D 2017-07-28T02:02:45.191
 +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
@@@ -346,22 -395,22 +346,22 @@@ F src/auth.c 79f96c6f33bf0e5da8d1c282ce
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
 -F src/btree.c f55ea8f456d103328d61076be40fa39acbfea05eaa4eccfed275532a63c867c4
 -F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
 -F src/btreeInt.h 97700795edf8a43245720414798b7b29d8e465aef46bf301ffacd431910c0da1
 -F src/build.c 74108007d286232fb4290464ee5452fa860c26215f8caa0e6c7cbf69a6fafe8f
 -F src/callback.c 8e14b60d1ed1c87c02cb5f121ecda99224f2aea6524a77ee6f72c9b5c7110f84
 +F src/btree.c de57bf3f205082eb4ad8c923af7ecd1d10c4f15656f6a38038a3bd9b8ac3fc2a
 +F src/btree.h 80f518c0788be6cec8d9f8e13bd8e380df299d2b5e4ac340dc887b0642647cfc
 +F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
 +F src/build.c 4026a9c554b233e50c5e9ad46963e676cf54dd2306d952aa1eaa07a1bc9ce14f
 +F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 47d91a25ad8f199a71a5b1b7b169d6dd0d6e98c5719eca801568798743d1161c
 -F src/ctime.c ff1be3eed7bdd75aaca61ca8dc848f7c9f850ef2fb9cb56f2734e922a098f9c0
 -F src/date.c 48f743d88bbe88f848532d333cca84f26e52a4f217e86f86be7fc1b919c33d74
 -F src/dbstat.c 7a4ba8518b6369ef3600c49cf9c918ad979acba610b2aebef1b656d649b96720
 -F src/delete.c 939bd15e6b54b82b951e1c0ffc2ff2b4ab579196780a1f6d394e47bd6f799b6c
 -F src/expr.c fdb2fc465cabbf372fecad1fc2b291758bec74150b4db0fb945332e09df28a0e
++F src/ctime.c 9793c9128901afbaa7561c9dcb510c96c6187225680ef644577bd74e2551b3a6
 +F src/date.c cc42a41c7422389860d40419a5e3bce5eaf6e7835c3ba2677751dc653550a5c7
 +F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 +F src/delete.c 665e705641e5815c3f32d05820d1a5aa630274e568af73f377fdbc614fcf40b4
 +F src/expr.c 30f61b7d8236def0e99485651e5d983a102afa4cbc8b1ef0ab19ccb1f3841f99
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 -F src/fkey.c 5ff2c895fe087756d8085dc1a9bc229b5670e2a65c3929dd87c71e43649af333
 -F src/func.c e2854b19386b93ad6b498a3f3b7d6baa98ec14cfe84530fb12fce4414263d871
 +F src/fkey.c db65492ae549c3b548c9ef1f279ce1684f1c473b116e1c56a90878cd5dcf968d
 +F src/func.c 9d52522cc8ae7f5cdadfe14594262f1618bc1f86083c4cd6da861b4cf5af6174
  F src/global.c 8a6ab6b4d91effb96ffa81b39f0d70c862abca157f8aaa194600a4a8b7923344
 -F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
 +F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
@@@ -387,38 -436,39 +387,38 @@@ 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 30e2c43e4955db990e5b5a81e901f8aa74cc8820
+ F src/os_unix.c 9aa19db965d574cbaf74405cd51c58b87fdbfe045b8bbfc01b18bdeeda3c4305
  F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 80893c0860199aebc6efa4f102ab11eebde338b7fdbb0c04d4b04647c2fd62d1
 -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 eacc9cd3fa971f6056c0a312a61430df7c8d0b1fc01774e9209becf2c184b251
 +F src/select.c c444ca057d48cf1a4eb8f6a58fbc13418a7f83ae94a6bd6f29f7ad6c704a9e4c
 +F src/shell.c a37d96b20b3644d0eb905df5aa7a0fcf9f6e73c15898337230c760a24a8df794
- F src/sqlite.h.in 8dd468837a4f6d76713e3a4cc65bea48095009038593d41040ab46c1b351197f
++F src/sqlite.h.in d603987eee5f7a2fa81d4baf5ec70b67b214bd34f7e1819653f5ec3b9c982eee
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 -F src/sqlite3ext.h 967154985ed2ae62f90d9029bb5b5071793d847f1696a2ebe9e8cc0b042ae60b
 -F src/sqliteInt.h 3cbbcb67ba66ffe44a6768c95df22137335e9ef167d5da93bf0c1ed20a91b992
 +F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h aea3aa1b81e0d07d5b1c39b8c5a54a1dc5e4f10136cb63da392aef9eb2a5108b
++F src/sqliteInt.h 40785f84fc3d3b25b54f4325d42992f41a73e81de57b354271bd2de0ae377625
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
 -F src/tclsqlite.c 2c29b0b76e91edfd1b43bf135c32c8674710089197327682b6b7e6af88062c3d
 -F src/test1.c 8513b17ca4a7a9ba28748535d178b6e472ec7394ae0eea53907f2d3bcdbab2df
 +F src/tclsqlite.c c8cf60d0c5411d5e70e7c136470d29dbe760d250f55198b71682c67086524e4a
- F src/test1.c c99f0442918a7a5d5b68a95d6024c211989e6c782c15ced5a558994baaf76a5e
++F src/test1.c 4856c3d776e11d0975bf56ad41626b467af6af6443a937c36c3d9d4643029f7c
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 -F src/test3.c b8434949dfb8aff8dfa082c8b592109e77844c2135ed3c492113839b6956255b
 +F src/test3.c d03f5b5da9a2410b7a91c64b0d3306ed28ab6fee
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
- F src/test6.c 004ad42f121f693b8cbe060d1a330678abc61620
+ F src/test6.c e8d839fbc552ce044bec8234561a2d5b8819b48e29548ad0ba400471697946a8
  F src/test7.c 5612e9aecf934d6df7bba6ce861fdf5ba5456010
  F src/test8.c 4f4904721167b32f7a4fa8c7b32a07a673d6cc86
  F src/test9.c 12e5ba554d2d1cbe0158f6ab3f7ffcd7a86ee4e5
@@@ -428,11 -478,11 +428,11 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
  F src/test_blob.c f65ac717da2618691cf9dad094e6da0219dcd208
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 -F src/test_config.c abf6fc1fe9d041b699578c42e3db81f8831c4f5b804f1927958102ee8f2b773e
 +F src/test_config.c edcba290248dc18736dd814c9b95863c6762e0b35753048d8cbe5bf65f7abfbb
  F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
- F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
+ F src/test_devsym.c 1960abbb234b97e9b920f07e99503fc04b443f62bbc3c6ff2c2cea2133e3b8a2
 -F src/test_fs.c 35a2f7dd8a915900873386331386d9ba1ae1b5026d74fd20c2807bc76221f291
 +F src/test_fs.c e16cbe68d3b107e00a907c20a9a02629870eb69b
  F src/test_func.c a4fdab3363b436c1b12660e9362ce3f3782b7b5e
  F src/test_hexio.c 1d4469ca61ab202a1fcec6543f584d2407205e8d
  F src/test_init.c 4413c211a94b62157ca4c145b3f27c497f03c664
@@@ -703,9 -754,9 +703,9 @@@ F test/exists.test 79a75323c78f02bbe9c2
  F test/expr.test 66a2c9ac34f74f036faa4092f5402c7d3162fc93
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
  F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
- F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
+ F test/fallocate.test 87b5e43c872b7e69cd80b7b8813eb102b571a75d45dda24e38b65537bcc85733
  F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3
 -F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4
 +F test/filefmt.test e4edbdc637ca9576ccf4337a3cce627d9df7a56c
  F test/fkey1.test ba64806ff9a04eecab2679caad377ae99a5e94e4
  F test/fkey2.test 155809016fad6b2a1491facf2ac53a551bc57c2c
  F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
@@@ -1035,8 -1087,8 +1035,8 @@@ F test/parser1.test 391b9bf9a229547a129
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 8aaa22a0f428a7e6b8446b97bc7691a273eaeff5dc290fb9129bf79fa9813a6e
 -F test/permutations.test 3b94f8fd431d39fac4952eb5dc38e1bb2b4518e1ac967d66f5abc815c104aeb6
 -F test/pragma.test f274259d6393b6681eb433beb8dd39a26ec06a4431052a4880b43b84912a3f58
++F test/permutations.test 0672e2db670217b156ae6d32c7de3abcda50a305743e7d45d1063ede31159bd0
 +F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
  F test/pragma4.test 6e85b6eab8e61ffc9c7db59d842276674e8e3264
@@@ -1059,9 -1111,9 +1059,9 @@@ F test/rdonly.test 64e2696c322e3538df0b
  F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
  F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
  F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 -F test/releasetest.tcl 7bb585433ce7fb2a2c255ae4b5e24f1bc27fe177ec1120f886cc4852f48f5ee9 x
 +F test/releasetest.tcl 936c8b9c72d46a86d0f9d65c536e883c2d79a8f53a5324283757bfc9d8b5a656 x
  F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
- F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
+ F test/rollback.test f580934279800d480a19176c6b44909df31ce7ad45267ea475a541daa522f3d3
  F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
  F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
  F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
@@@ -1179,9 -1232,9 +1179,9 @@@ F test/superlock.test ec94f0556b6488d97
  F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849
  F test/sync.test 2f84bdbc2b2df1fcb0220575b4b9f8cea94b7529
  F test/sync2.test 6be8ed007fa063b147773c1982b5bdba97a32badc536bdc6077eff5cf8710ece
- F test/syscall.test f59ba4e25f7ba4a4c031026cc2ef8b6e4b4c639c
 -F test/syscall.test a39d9a36f852ae6e4800f861bc2f2e83f68bbc2112d9399931ecfadeabd2d69d
++F test/syscall.test 26f05bc237853a7588b9a4c9111aacb8cdd32d2562c36fee7d9dfc4731c6c329
  F test/sysfault.test c9f2b0d8d677558f74de750c75e12a5454719d04
 -F test/tabfunc01.test c47171c36b3d411df2bd49719dcaa5d034f8d277477fd41d253940723b969a51
 +F test/tabfunc01.test 699251cb99651415218a891384510a685c7ab012
  F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
@@@ -1580,7 -1638,7 +1581,10 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b
- R 5aba315ce772ced25c1b87936307ec42
 -P 4477e60cd801dab7a8aec12c5bc5e81e774bedbfed38abbc8eb8b37336141a44
 -R 7b37fdaf5e84d7527bf9bb356bdba2dd
++P 24c9cd460051781f7e6417b7e205274319258f061ae1191a6c5ff5af615439c9 67bad7fb9b2fdb29b63308f22062444084dc28191a542e08076dc2e39caf6f62
++R 52d5da1e6c65e285a15752ad8c60b72a
++T *branch * batch-atomic-write-3.19
++T *sym-batch-atomic-write-3.19 *
++T -sym-branch-3.19 *
  U drh
- Z c0ec9b17a9a0e51afaa3dc2485cf6a08
 -Z 27d0a818d20124b850051ada33dcfbb8
++Z db5307b269591715fdc95cf9a91a4aa8

diff --cc manifest.uuid
index 24b676d8830a6ecdd5e67926c49f10fa9433704c,508bf735c281a848d1d0ec1c7293ddb69ecb94e4..65256a71e995a15c5db1c813aa0afd2e4f9cb2b2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 24c9cd460051781f7e6417b7e205274319258f061ae1191a6c5ff5af615439c9
 -67bad7fb9b2fdb29b63308f22062444084dc28191a542e08076dc2e39caf6f62
++def55027b1f1db9c083830019dbcc3daed94f6cc70a76b285ac1af9d82f81695

diff --cc src/ctime.c
Simple merge

diff --cc src/pager.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc test/syscall.test
Simple merge