From: dan <dan@noemail.net>
Date: Wed, 22 Apr 2015 11:34:38 +0000 (+0000)
Subject: Add comments related to database locking to sqlite3ota.h.
X-Git-Tag: version-3.8.11~252^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39b7ff7987752298456f3a04edbec0436511a0e0;p=thirdparty%2Fsqlite.git

Add comments related to database locking to sqlite3ota.h.

FossilOrigin-Name: 77242965e77446313a8f0a65a39fccb67fe4cabf
---

diff --git a/ext/ota/sqlite3ota.h b/ext/ota/sqlite3ota.h
index f1695ab271..943129424e 100644
--- a/ext/ota/sqlite3ota.h
+++ b/ext/ota/sqlite3ota.h
@@ -229,6 +229,19 @@
 ** To remove all OTA extension state information, returning an OTA database 
 ** to its original contents, it is sufficient to drop all tables that begin
 ** with the prefix "ota_"
+**
+** DATABASE LOCKING
+**
+** An OTA update may not be applied to a database in WAL mode. Attempting
+** to do so is an error (SQLITE_ERROR).
+**
+** While an OTA handle is open, a SHARED lock may be held on the target
+** database file. This means it is possible for other clients to read the
+** database, but not to write it.
+**
+** If an OTA update is started and then suspended before it is completed,
+** then an external client writes to the database, then attempting to resume
+** the suspended OTA update is also an error (SQLITE_BUSY).
 */
 
 #ifndef _SQLITE3OTA_H
diff --git a/manifest b/manifest
index 852fa88512..96272c5c22 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\scomment\sto\ssqlite3ota.h.\sNo\scode\schanges.
-D 2015-04-21T15:35:30.574
+C Add\scomments\srelated\sto\sdatabase\slocking\sto\ssqlite3ota.h.
+D 2015-04-22T11:34:38.145
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 79b306896135a2305cfb7e6d88990fc4820fb917
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -139,7 +139,7 @@ F ext/ota/otacrash.test 8346192b2d46cbe7787d5d65904d81d3262a3cbf
 F ext/ota/otafault.test 8c43586c2b96ca16bbce00b5d7e7d67316126db8
 F ext/ota/otafault2.test fa202a98ca221faec318f3e5c5f39485b1256561
 F ext/ota/sqlite3ota.c b45d73607b78eba89ca224fb0d10e10d1b32b6b0
-F ext/ota/sqlite3ota.h a57edd7097b170842350f7024142bd23693ef17f
+F ext/ota/sqlite3ota.h c0d32e46aa52cce3b16899399639deaff1f27b2f
 F ext/ota/test_ota.c e34c801c665d64b4b9e00b71f1acf8c652404b2b
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/rtree.c 14e6239434d4e3f65d3e90320713f26aa24e167f
@@ -1269,7 +1269,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 66eff473c3634edb42f6ad6955acfba3e3a10def
-R b0ede25cbd76dcce408ddbe246efdf05
+P 352fa09efd8240567b8f9487944e8c3ade4e664a
+R 7514208e376f1404350994ff3e1120f2
 U dan
-Z f4ef1c4f6a4788f592c8604fbd633b01
+Z aab2f59acbc2b3195f57173b44acb17c
diff --git a/manifest.uuid b/manifest.uuid
index 956fd48c3b..511df81b1d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-352fa09efd8240567b8f9487944e8c3ade4e664a
\ No newline at end of file
+77242965e77446313a8f0a65a39fccb67fe4cabf
\ No newline at end of file