Fix PRAGMA integrity_check so that it does not cancel the PRAGMA vdbe_debug

setting.

FossilOrigin-Name: aaa3a19f8cf5ba7003634e4610abc7832354af91d7c7f65469218678f66bcd46

diff --git a/manifest b/manifest
index f4b38ef12a8b6a7f441ded374bc9405fd2c95da6..277e11695754d8c378cd09bd2922655aa5b3c319 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s--vdbe-debug\scommand-line\soption\sto\sdbfuzz2.
-D 2019-01-11T14:38:47.236
+C Fix\sPRAGMA\sintegrity_check\sso\sthat\sit\sdoes\snot\scancel\sthe\sPRAGMA\svdbe_debug\nsetting.
+D 2019-01-11T14:46:44.854
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 45a3fef4d325ac0220c2172aeec4e4321da351f073f3b8e8ddea655f49ef6f2b
@@ -453,7 +453,7 @@ F src/auth.c 0fac71038875693a937e506bceb492c5f136dd7b1249fbd4ae70b4e8da14f9df
 F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 9632272d3c41c7dab61bd96ae419ee5786b7b49cb14dc75a5550b20758c08893
+F src/btree.c 735e0cfc61678f063bc95e12971270206ee61b6c66406d25b3997ad17f823c02
 F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2
 F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
 F src/build.c 2a1b80dbe783649d4cc59e33e08fc7e563f15e05ec0f6365c441d45e16bcd481
@@ -1797,7 +1797,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 05c7609cfd02f49114876267d7090f4e0ea2467f3aa7c65019c5986ec8f60a87
-R 59f8d809003217ffe40e8229e82747b7
+P 599b4df43c64ce295517c804b6bb4c3ab77d77e0ba585dc0657274f55489a3b1
+R 45f241f3ac79b1a38c0ec8dd550770ca
 U drh
-Z 065fa37efdf7cf83e88a09444acc4d6c
+Z 879b7cd1fe883a82b97b58fcaeacbfc6

diff --git a/manifest.uuid b/manifest.uuid
index 879d48c37b3c7dd9965c274e477a06c5659841e3..3b2436e3234294fdd92a6f95a44427b8c4dcf31e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-599b4df43c64ce295517c804b6bb4c3ab77d77e0ba585dc0657274f55489a3b1
\ No newline at end of file
+aaa3a19f8cf5ba7003634e4610abc7832354af91d7c7f65469218678f66bcd46
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index cb8c756225206a0fcbf5e580ff19dd9c1e4bb94e..a5b62143d254497d593fe56f4f52f16264f58f9e 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9804,7 +9804,7 @@ char *sqlite3BtreeIntegrityCheck(
   Pgno i;
   IntegrityCk sCheck;
   BtShared *pBt = p->pBt;
-  int savedDbFlags = pBt->db->flags;
+  u64 savedDbFlags = pBt->db->flags;
   char zErr[100];
   VVA_ONLY( int nRef );