From: dan <dan@noemail.net>
Date: Mon, 30 Mar 2020 11:17:37 +0000 (+0000)
Subject: Fix "GCC_VESRION" typo in wal.c.
X-Git-Tag: version-3.32.0~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e42b9917566acdc67a04b08dbf8fc3227fc785d;p=thirdparty%2Fsqlite.git

Fix "GCC_VESRION" typo in wal.c.

FossilOrigin-Name: fbd9378727141848ba2f5a8eee3076ecbd315e4a87b264c6d890103d56b2e4bc
---

diff --git a/manifest b/manifest
index 8369e9b1b0..ca64e1f989 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhancements\sto\sthe\sSQLITE_ENABLE_SETLK_TIMEOUT\scompile-time\soption\sto\savoid\nrare\sdeadlocks\son\srecovery.
-D 2020-03-28T19:02:39.828
+C Fix\s"GCC_VESRION"\stypo\sin\swal.c.
+D 2020-03-30T11:17:37.831
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -614,7 +614,7 @@ F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587d
 F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
 F src/vtab.c 7b704a90515a239c6cdba6a66b1bb3a385e62326cceb5ecb05ec7a091d6b8515
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c b85296a95521d0db188c8a381034f958fab4b3e40f22814f983c4eade6542426
+F src/wal.c 540904ecada1091cf7c738d4b71574641a77323fe02e3b4e7a2b86a275759c5d
 F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c 7c429c694abd12413a5c17aec9f47cfe9eba6807e6b0a32df883e8e3a14835ed
 F src/where.c 9546c82056e8cdb27291f98cf1adca5d271240b399bb97b32f77fc2bea6146c9
@@ -1860,8 +1860,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 076658e5d21d9284448f41312b83a6c3d25394c2bfa088ef6cdfe1dc60277856 c516027d5fd876b7d0bf566435667d554db29ded30ad6fc1165caa4a93d015a0
-R fb7b5ba8a8e597ba045f062237a1d909
-T +closed c516027d5fd876b7d0bf566435667d554db29ded30ad6fc1165caa4a93d015a0
-U drh
-Z 0010a8489027f8740d0c36f8296e432b
+P 06885e9aa4e430d10f4b32105bcf405c65fd6f7b4cd451baf56fb4f12f408963
+R d3381eb04b03e045e5d7b87cb8d01387
+U dan
+Z 23a7e35903c7780d44c9892586fd5cbf
diff --git a/manifest.uuid b/manifest.uuid
index 156bd9418c..2ccee11f5c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-06885e9aa4e430d10f4b32105bcf405c65fd6f7b4cd451baf56fb4f12f408963
\ No newline at end of file
+fbd9378727141848ba2f5a8eee3076ecbd315e4a87b264c6d890103d56b2e4bc
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index e6742f1c44..9fbc0e18af 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -262,7 +262,7 @@ int sqlite3WalTrace = 0;
 ** WAL mode depends on atomic aligned 32-bit loads and stores in a few
 ** places.  The following macros try to make this explicit.
 */
-#if GCC_VESRION>=5004000
+#if GCC_VERSION>=5004000
 # define AtomicLoad(PTR)       __atomic_load_n((PTR),__ATOMIC_RELAXED)
 # define AtomicStore(PTR,VAL)  __atomic_store_n((PTR),(VAL),__ATOMIC_RELAXED)
 #else
@@ -2604,7 +2604,8 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
     for(i=1; i<WAL_NREADER; i++){
       rc = walLockExclusive(pWal, WAL_READ_LOCK(i), 1);
       if( rc==SQLITE_OK ){
-        mxReadMark = AtomicStore(pInfo->aReadMark+i,mxFrame);
+        AtomicStore(pInfo->aReadMark+i,mxFrame);
+        mxReadMark = mxFrame;
         mxI = i;
         walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
         break;