From: dan <dan@noemail.net>
Date: Tue, 21 Jan 2020 13:40:35 +0000 (+0000)
Subject: Fix a problem in the userauth extension causing it to occasionally set "PRAGMA count_... 
X-Git-Tag: version-3.31.0~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39ef8b31fb042db26736ca4704486d8da02909f0;p=thirdparty%2Fsqlite.git

Fix a problem in the userauth extension causing it to occasionally set "PRAGMA count_changes" (and some others) to true.

FossilOrigin-Name: 3a62f64222ebd176c06e89b9fe5275b7b1f09df0afbae1c5c148a4e527e9d80b
---

diff --git a/ext/userauth/userauth.c b/ext/userauth/userauth.c
index a8ed01ae45..fa708516ee 100644
--- a/ext/userauth/userauth.c
+++ b/ext/userauth/userauth.c
@@ -40,7 +40,7 @@ static sqlite3_stmt *sqlite3UserAuthPrepare(
   char *zSql;
   int rc;
   va_list ap;
-  int savedFlags = db->flags;
+  u64 savedFlags = db->flags;
 
   va_start(ap, zFormat);
   zSql = sqlite3_vmprintf(zFormat, ap);
diff --git a/manifest b/manifest
index f8c3401293..1d746b3a01 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sseries.c\sand\sspellfix.c\sextensions\sto\suse\sSQLITE_VTAB_INNOCUOUS\ncorrectly.\s\sFix\sthe\sdocumentation\son\ssqlite3_vtab_config()\sto\stake\sinto\naccount\sSQLITE_VTAB_INNOCUOUS\sand\sSQLITE_VTAB_DIRECTONLY.
-D 2020-01-21T12:29:02.631
+C Fix\sa\sproblem\sin\sthe\suserauth\sextension\scausing\sit\sto\soccasionally\sset\s"PRAGMA\scount_changes"\s(and\ssome\sothers)\sto\strue.
+D 2020-01-21T13:40:35.685
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -449,7 +449,7 @@ F ext/session/sqlite3session.h a2db5b72b938d12c727b4b4ec632254ca493670a9c0de597a
 F ext/session/test_session.c 98797aba475a799376c9a42214f2d1debf2d0c3cb657d9c8bbf4f70bf3fb4aec
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
-F ext/userauth/userauth.c f81aa5a3ecacf406f170c62a144405858f6f6de51dbdc0920134e629edbe2648
+F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -1857,7 +1857,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 cffcf12f03906debeac6a974534b4439a4952cc72767e3bcb8e6d91da944d69f
-R 001bb5c955de0c6c88c2ac069af9f4e6
-U drh
-Z 64b8ca1480a3ca93149154c746b9a654
+P 9265cb7f026c0e959bd034d4cd94fe597744e0dd455d0a20736ee5f5bee880c8
+R 811bb3e4f1e06ed20aee305d7e233a8e
+U dan
+Z 7bdcf7d21db717d0bf8ab96901d5da0c
diff --git a/manifest.uuid b/manifest.uuid
index 1bb3b98380..9fd3ee9c72 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9265cb7f026c0e959bd034d4cd94fe597744e0dd455d0a20736ee5f5bee880c8
\ No newline at end of file
+3a62f64222ebd176c06e89b9fe5275b7b1f09df0afbae1c5c148a4e527e9d80b
\ No newline at end of file