From: dan <dan@noemail.net>
Date: Fri, 4 Sep 2020 19:12:16 +0000 (+0000)
Subject: Merge tsan error fix from trunk into this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8280fcc66f4aff17f05c49ac4a8c42485de4bf47;p=thirdparty%2Fsqlite.git

Merge tsan error fix from trunk into this branch.

FossilOrigin-Name: 93cc60b34278ec45e382edbd99aa22268eb32bfe6c917bad7d1e9f158cedf57b
---

8280fcc66f4aff17f05c49ac4a8c42485de4bf47
diff --cc manifest
index 20fc5bacda,5498925793..f64d149a05
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthis\sbranch\swith\slatest\schanges\sfrom\strunk.
- D 2020-09-04T17:40:22.202
 -C Fix\sa\stsan\serror\sthat\scould\soccur\swhen\susing\sshared-cache\smode.
 -D 2020-09-04T19:10:43.046
++C Merge\stsan\serror\sfix\sfrom\strunk\sinto\sthis\sbranch.
++D 2020-09-04T19:12:16.096
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -477,13 -476,13 +477,13 @@@ F src/auth.c a3d5bfdba83d25abed1013a8c7
  F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 87f2c3f1812b49fbb700fefc4852216af2904016b42b22c2cd5b9c254cc6665a
+ F src/btree.c 1fbb15cf6af2ccd4bc784f52bda7e6a860e303d677587b6a4b95d72ae36480a0
  F src/btree.h c64f1439377e2edf31f7c3a562586a96b71f8d0ca47e65756e7d122fd8f06928
  F src/btreeInt.h ffd66480520d9d70222171b3a026d78b80833b5cea49c89867949f3e023d5f43
 -F src/build.c 92b61c2be1e35a619391f17c2d1b108901ad5e4df99becc0b064a934e6ec662a
 -F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
 +F src/build.c 79bcb3bc329df26659bb3333d22b7149bc4ec120d77b8db980cace53742fbe03
 +F src/callback.c d8cdf5d697a31cf54a2b64bce9001fe24f3522a566f44c9fe1eb3a0c7e291c56
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 -F src/ctime.c e98518d2d3d4029a13c805e07313fb60c877be56db76e90dd5f3af73085d0ce6
 +F src/ctime.c f5eaef0a5985fab6fc21e8b00aeaea1ca862a09c1ea5e505b0ad1da157eec247
  F src/date.c dace306a10d9b02ee553d454c8e1cf8d3c9b932e137738a6b15b90253a9bfc10
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
  F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
@@@ -1446,7 -1437,7 +1446,7 @@@ F test/thread2.test f35d2106452b77523b3
  F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
  F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
  F test/threadtest2.c a70a8e94bef23339d34226eb9521015ef99f4df8
- F test/threadtest3.c 4de1edf7cddac6195acfaea56cccb8572df803854531251784f6b8ca46f256e3
 -F test/threadtest3.c e63013af10cf236c7610eb06d33bde08c861806dc64be811940ff4d9ddd34a4f
++F test/threadtest3.c e58f0e1b6a3e4ccb24f831650c296e800f6299cc258793f6fc372591f416cb93
  F test/threadtest4.c c1e67136ceb6c7ec8184e56ac61db28f96bd2925
  F test/time-wordcount.sh 8e0b0f8109367827ad5d58f5cc849705731e4b90
  F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
@@@ -1619,12 -1610,12 +1619,13 @@@ F test/triggerF.test 5d76f0a8c428ff87a4
  F test/triggerG.test 2b816093c91ba73c733cfa8aedcc210ad819d72a98b1da30768a3c56505233e9
  F test/triggerupfrom.test d25961fa70a99b6736193da7b49a36d8c1d28d56188f0be6406d4366315cd6e4
  F test/trustschema1.test 4e970aef0bfe0cee139703cc7209d0e0f07725d999b180ba50770f49edef1494
 -F test/tt3_checkpoint.c 9e75cf7c1c364f52e1c47fd0f14c4340a9db0fe1
 -F test/tt3_index.c 39eec10a35f57672225be4d182862152896dee4a
 -F test/tt3_lookaside1.c 0377e202c3c2a50d688cb65ba203afeda6fafeb9
 +F test/tt3_checkpoint.c 9a7fe00e07700af027769d83ef67ab727927ae6c865ecdc71fe8011194200c53
 +F test/tt3_index.c 95592839426dc85ce5a7a57b41be2cbf3c2ec3457b9cd841a06ed5877f712c7c
 +F test/tt3_lookaside1.c 2ddd99bfffeef288f0786827ef68f912f6f47ce3d3184e62f05808d8e13b920e
 +F test/tt3_reuseschema.c 4d52e141f89f009028d8ab0bd1f0697d0edffa94bafc1fff0f7ad4d9d9baa549
+ F test/tt3_shared.c b37d22defc944a2ac4c91c927fd06c1d48cd51e2ce9d004fe868625bd2399f93
 -F test/tt3_stress.c f9a769ca8b026ecc76ee93ca8c9700a5619f8e51c581107c4053ba6ac97f616f
 -F test/tt3_vacuum.c 1753f45917699c9c1f66b64c717a717c9379f776
 +F test/tt3_stress.c 077e817ac1168443b075fedb44e92db84bb4dc5bd3b6fe1aba25c94ac280b231
 +F test/tt3_vacuum.c ca42adcf8a671abbe34338b828464269e21758a6b4857b889dabfd39a3206d98
  F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
  F test/types2.test 1aeb81976841a91eef292723649b5c4fe3bc3cac
  F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
@@@ -1889,7 -1880,7 +1890,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 e456d437083c550570063b874d685f110162a0551f51d5f190f90c1354e6e996 5dd05940617fb05ee2faf212b15afc3a8e9695318eccb76761b37359fea681d1
- R 131d849b5becc25082feb538020c84a4
 -P 5dd05940617fb05ee2faf212b15afc3a8e9695318eccb76761b37359fea681d1
 -R 0274cf48514643c9c3f213a9959e5172
++P ca8deb44c70c3d8a1cdde5bb92a3db812e4e38bfce9a97feb658594c8267609f de80bc87300257cc49d98e2d22e914211f213dce912f320c8b37b3883c73923c
++R 8f3c24729ea31526ddfdb1439e7d08ee
  U dan
- Z 14099e63d2c52538f06ba605b32b270a
 -Z c8e0642635bfc4eca0e83411ec752c32
++Z b7307dc2c6c3393f6479cd43967fb6f7
diff --cc manifest.uuid
index d3133a2c1e,d93272820f..dfb6971b7e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ca8deb44c70c3d8a1cdde5bb92a3db812e4e38bfce9a97feb658594c8267609f
 -de80bc87300257cc49d98e2d22e914211f213dce912f320c8b37b3883c73923c
++93cc60b34278ec45e382edbd99aa22268eb32bfe6c917bad7d1e9f158cedf57b
diff --cc test/threadtest3.c
index 2910edfa28,41c0fb9ac6..cf67ca5fae
--- a/test/threadtest3.c
+++ b/test/threadtest3.c
@@@ -1436,7 -1433,7 +1436,8 @@@ static void dynamic_triggers(int nMs)
  #include "tt3_lookaside1.c"
  #include "tt3_vacuum.c"
  #include "tt3_stress.c"
 +#include "tt3_reuseschema.c"
+ #include "tt3_shared.c"
  
  int main(int argc, char **argv){
    struct ThreadTest {
@@@ -1461,7 -1458,7 +1462,8 @@@
      { vacuum1,             "vacuum1", 10000 },
      { stress1,             "stress1", 10000 },
      { stress2,             "stress2", 60000 },
 +    { reuse_schema_1,      "reuse_schema_1", 20000 },
+     { shared1,             "shared1", 10000 },
    };
    static char *substArgv[] = { 0, "*", 0 };
    int i, iArg;