Fix the SQLITE_DIRECT_OVERFLOW_READ compile-time option so that it works

with SQLITE_HAS_CODEC.

FossilOrigin-Name: fd085e9260bec18f968704abb2dd324d954baa121d13b67c3f5b801e9e3834aa

diff --git a/manifest b/manifest
index 683ca9c0a1b1f236038c4fa7d150e8dc31a0fe7b..844bd02081a23877ac02e7a77a08ac76be27bd49 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sredundant\sparameter\sextraction\scall\sfrom\sthe\spercentile.c\sextension.
-D 2019-03-02T12:17:35.599
+C Fix\sthe\sSQLITE_DIRECT_OVERFLOW_READ\scompile-time\soption\sso\sthat\sit\sworks\nwith\sSQLITE_HAS_CODEC.
+D 2019-03-02T15:25:24.014
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 1ad7263f38329c0ecea543c80f30af839ee714ea77fc391bf1a3fbb919a5b6b5
@@ -502,7 +502,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 2b9604eb5c12f40a0613e832b6267f5814f84479d570d482ba6f98d7affa7c1c
 F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 5420ef6ea46db11b6ba1231f39fc2a1bf19ccad185efc6dc46f1520a608de4f8
+F src/pager.c 5ff85a1dafdbbc3d27e21dbb52ac02066507b1e2d7da4cd4961408eed2cce23a
 F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
 F src/parse.y 741a270b7f2f85bc5d026d06fb5a9ccba5335304ff2831e1cb44b36cd0da6006
 F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee
@@ -1805,7 +1805,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 f5732f4caf7a37a6445c61ae0d0ac14cc9deb897376e73aa36a1ead025b92c69
-R 8c1a5c619573aadfcf11f42bd8a532d3
+P d49c32e6e7cc341b5961d2c7b7c68d1649c6542eeec201660e3f82a55aea9e3b
+R 50571770f9cddd9f6937b98986c246b4
 U drh
-Z d54032ab771b9f2b12d64cf88c6e15a6
+Z 39fd6294d7f36d7da03a65b55eee9cda

diff --git a/manifest.uuid b/manifest.uuid
index 286b76ea18ef39287eebec77aea7a09467d667fa..5a3c4e431aeaeef95c20f1e3293656497f534628 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d49c32e6e7cc341b5961d2c7b7c68d1649c6542eeec201660e3f82a55aea9e3b
\ No newline at end of file
+fd085e9260bec18f968704abb2dd324d954baa121d13b67c3f5b801e9e3834aa
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 4660bbfabab968a67f3b8fe3f7954c324bfc4b6f..9dd3dfe007e0ade10236bab53b5eaf7a2293edb3 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -837,6 +837,9 @@ static const unsigned char aJournalMagic[] = {
 int sqlite3PagerDirectReadOk(Pager *pPager, Pgno pgno){
   if( pPager->fd->pMethods==0 ) return 0;
   if( sqlite3PCacheIsDirty(pPager->pPCache) ) return 0;
+#ifdef SQLITE_HAS_CODEC
+  if( pPager->xCodec!=0 ) return 0;
+#endif
 #ifndef SQLITE_OMIT_WAL
   if( pPager->pWal ){
     u32 iRead = 0;