From: drh <drh@noemail.net>
Date: Sat, 16 May 2020 16:23:48 +0000 (+0000)
Subject: Extra memory barrier during initialization.
X-Git-Tag: version-3.32.0~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c48428899d5ba5f8689455d0a82174a1fe3fa4c3;p=thirdparty%2Fsqlite.git

Extra memory barrier during initialization.

FossilOrigin-Name: 043a7e142dfc2b0da5fbc0b025d005ccad4886f0b0ff65426ba9155ca40394ca
---

diff --git a/manifest b/manifest
index 456ff4f533..cf51b213b3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssqlite3BeginBenignMalloc()\sand\sEndBenignMalloc()\scalls\sto\sdebugging\sfunction\ssqlite3VdbePrintOp().
-D 2020-05-16T15:18:27.540
+C Extra\smemory\sbarrier\sduring\sinitialization.
+D 2020-05-16T16:23:48.870
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -497,7 +497,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 8e4211d04eb460c0694d486c6ba1c068d468c6f653c3f237869a802ad82854de
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 421310045bd78afefb772294a99e50f37d87ae578786a6169074e6291e30d969
-F src/main.c 7e38af6c454cf25d3f543e94647b3d1f5a56d43c4bdcb2d85b94c24392810d45
+F src/main.c 97d962ab1f830540043042e41085c5b85636a60e6ed95002c1a56b64f7eb6a0b
 F src/malloc.c 167e91665080a2a6f92d358419e0b7e6440f2bba0b55e764a4f0197c95c8a077
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -1866,7 +1866,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7cf93dc55c48c68731a1fe3ae3517fcfeb5c252bfa87e715a333c6194bcc0ace
-R 60cac945dac221a30fe3e7456c780110
-U dan
-Z a51f2ca285cdfd2574eb5f3711aed080
+P 6f857d0e9e0893524c2f828a1a1600fefb6efeff12ecbc9bb1da106a5aff9c1c
+R 54e24fb1c480e2f51c51fab1349d1fa6
+U drh
+Z 893128c3f173bb6e030eff4437373b32
diff --git a/manifest.uuid b/manifest.uuid
index 6c6071d1ae..d09b04e7c3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6f857d0e9e0893524c2f828a1a1600fefb6efeff12ecbc9bb1da106a5aff9c1c
\ No newline at end of file
+043a7e142dfc2b0da5fbc0b025d005ccad4886f0b0ff65426ba9155ca40394ca
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 019b7538bc..9f99cbdf3a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -313,6 +313,7 @@ int sqlite3_initialize(void){
     if( rc==SQLITE_OK ){
       sqlite3PCacheBufferSetup( sqlite3GlobalConfig.pPage, 
           sqlite3GlobalConfig.szPage, sqlite3GlobalConfig.nPage);
+      sqlite3MemoryBarrier();
       sqlite3GlobalConfig.isInit = 1;
 #ifdef SQLITE_EXTRA_INIT
       bRunExtraInit = 1;