From: dan <dan@noemail.net>
Date: Mon, 25 Feb 2019 19:23:01 +0000 (+0000)
Subject: Fix a comment in build.c.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20a434abd3e7b0daacbef3d55eb2ed9cf0cb5808;p=thirdparty%2Fsqlite.git

Fix a comment in build.c.

FossilOrigin-Name: d6a9bff6f5cc52957deffe47fdba1197db111cac110760dec7680f91499a99f1
---

diff --git a/manifest b/manifest
index 924323fe26..5e4ac75799 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
-D 2019-02-25T18:07:09.739
+C Fix\sa\scomment\sin\sbuild.c.
+D 2019-02-25T19:23:01.367
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 56456706c4da271309914c756c9c8ea537685f1c79f8785afa72f968d6810482
@@ -460,7 +460,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c 026f48c39b179a5602423904fcaaae87bbd75f659fd672b3756fea43356d9909
 F src/btree.h 63b94fb38ce571c15eb6a3661815561b501d23d5948b2d1e951fbd7a2d04e8d3
 F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
-F src/build.c 5db330027edad02d2b95d9dc7e3c3a49da275ef18892244fe2bb0097cbbee286
+F src/build.c f556ca5fe2c6a2a8c78bc7303a772f1d86979738cbdec112fbddca3f5505143a
 F src/callback.c 0d68a032872495351f70d533610a94388a4f191cce37ec7663d6598eaa8a4a21
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
@@ -1812,7 +1812,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 64f97530ad387655767b5205fb9a9c723210cd4975176ab6fb71bca0cb585a74 9da4fb59b28686630d63a79988b458726332cf06cc0e6e84d7c0a7600f5fcab0
-R 2412fdd8b7d3db9ce77c8ff9e4d454b6
+P 5c1cf30859ed734eb2d6bc52adb057ca62a6b5a7eef66d8da1fa833e84468dee
+R 8e28445e51bbd44868112d648be6aca8
 U dan
-Z b8aedb5a59524956a9b99428bbcbb6f4
+Z 15ea225cf86c07603b7ff5af7f2624e7
diff --git a/manifest.uuid b/manifest.uuid
index 509a87dc43..cea19022f6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5c1cf30859ed734eb2d6bc52adb057ca62a6b5a7eef66d8da1fa833e84468dee
\ No newline at end of file
+d6a9bff6f5cc52957deffe47fdba1197db111cac110760dec7680f91499a99f1
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 08617532b6..907b34c86a 100644
--- a/src/build.c
+++ b/src/build.c
@@ -290,13 +290,17 @@ int sqlite3UserAuthTable(const char *zTable){
 ** If this database connection was opened with the SQLITE_OPEN_SHARED_SCHEMA
 ** flag specified, then ensure that the database schema for database iDb
 ** is loaded. Either by obtaining a Schema object from the schema-pool, or
-** by reading the contents of the sqlite_master table.
+** by reading the contents of the sqlite_master table. Unless it is NULL, 
+** the location indicated by parameter pbUnload is set to 1 if a shared-schema 
+** is loaded.
 **
 ** If the database handle was not opened with SQLITE_OPEN_SHARED_SCHEMA, or
 ** if the schema for database iDb is already loaded, this function is a no-op.
 **
-** Non-zero is returned if a schema is loaded, or zero if it was already 
-** loaded when this function was called..
+** SQLITE_OK is returned if successful, or an SQLite error code otherwise. If
+** an error code is returned, (*pzErr) may be set to point to a buffer
+** containing an error message. It is the responsibility of the caller to
+** eventually free this buffer using sqlite3_free().
 */
 int sqlite3SchemaLoad(sqlite3 *db, int iDb, int *pbUnload, char **pzErr){
   int rc = SQLITE_OK;
@@ -308,7 +312,7 @@ int sqlite3SchemaLoad(sqlite3 *db, int iDb, int *pbUnload, char **pzErr){
     memset(&db->init, 0, sizeof(struct sqlite3InitInfo));
     rc = sqlite3InitOne(db, iDb, pzErr, 0);
     db->init = sv;
-    if( pbUnload ) *pbUnload = (rc==SQLITE_OK && (iDb!=1));
+    if( pbUnload && rc==SQLITE_OK && iDb!=1 ) *pbUnload = 1;
   }
   return rc;
 }