From: drh <drh@noemail.net>
Date: Wed, 24 Jan 2018 13:15:56 +0000 (+0000)
Subject: Improved error message output when the btreeinfo.c extension is run in
X-Git-Tag: version-3.23.0~190
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a87f8ce262cdb1901e4dc8a871dd967f94e33022;p=thirdparty%2Fsqlite.git

Improved error message output when the btreeinfo.c extension is run in
a connection that lacks sqlite_dbpage support.

FossilOrigin-Name: 461b0b81b2acedb1b9ca520657518d6778417c375aeb58c41ead840b75a6d985
---

diff --git a/ext/misc/btreeinfo.c b/ext/misc/btreeinfo.c
index d75f06277f..131b210a79 100644
--- a/ext/misc/btreeinfo.c
+++ b/ext/misc/btreeinfo.c
@@ -339,7 +339,8 @@ static int binfoColumn(
     sqlite3 *db = sqlite3_context_db_handle(ctx);
     int rc = binfoCompute(db, pgno, pCsr);
     if( rc ){
-      return rc;
+      pCursor->pVtab->zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(db));
+      return SQLITE_ERROR;
     }
   }
   switch( i ){
diff --git a/manifest b/manifest
index 70f6b23f88..f93da218d6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Prevent\sa\sharmless\sunused\svariable\swarning\swhen\scompiling\swith\nSQLITE_OMIT_TRACE.
-D 2018-01-24T12:14:43.331
+C Improved\serror\smessage\soutput\swhen\sthe\sbtreeinfo.c\sextension\sis\srun\sin\na\sconnection\sthat\slacks\ssqlite_dbpage\ssupport.
+D 2018-01-24T13:15:56.698
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 38f84f301cbef443b2d269f67a74b8cc536469831f70df7c3e912acc04932cc2
@@ -269,7 +269,7 @@ F ext/misc/README.md d6dd0fe1d8af77040216798a6a2b0c46c73054d2f0ea544fbbcdccf6f23
 F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87
 F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
 F ext/misc/appendvfs.c 3777f22ec1057dc4e5fd89f2fbddcc7a29fbeef1ad038c736c54411bb1967af7
-F ext/misc/btreeinfo.c d7fd9a2fe2fa33ba28488e2fce703ebecc759219ea9e0bb3b254784866c0a676
+F ext/misc/btreeinfo.c 78c8c57d325185ccc04b7679e5b020e34a4d9c87453e6b7ac943d0a26cee3256
 F ext/misc/carray.c ed96c218ea940b85c9a274c4d9c59fe9491c299147a38a8bba537687bd6c6005
 F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704
 F ext/misc/completion.c 52c3f01523e3e387eb321b4739a89d1fe47cbe6025aa1f2d8d3685e9e365df0f
@@ -1700,7 +1700,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 9e6066de84285252fb8999a8d8e02a46c5bb6c822e4f7421ad3911687357ee5d
-R 7e73e9644a1ec009a08fcc00aee933cc
+P 61a44961b5811c993ae8d4f820a21a0ee739fe5e88cbfe5e4190e0091912ca19
+R 9aa3fb89b7c642ba6cb5e4ab21b67bf7
 U drh
-Z e8177042bd88031a5c0c9d9fb215dabd
+Z 08e16fd59762f7c574401c408bcad9ff
diff --git a/manifest.uuid b/manifest.uuid
index 38eb19867d..a06a90d5fc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-61a44961b5811c993ae8d4f820a21a0ee739fe5e88cbfe5e4190e0091912ca19
\ No newline at end of file
+461b0b81b2acedb1b9ca520657518d6778417c375aeb58c41ead840b75a6d985
\ No newline at end of file