Merge the btreeNext() assertion bug fix from trunk.

FossilOrigin-Name: 11bd66e09035039fbfc4c5631196962dd3f2e6634f5123a7b2fec17aeaaab07b

diff --cc manifest
index d068879da9ca80428bfa2c861263ee2533726a80,c8299d9c0de19376eef956a0d7abf0140f6f1d55..363f32cb2e95504dbf4b2e87f1c00caa7267a593
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Consider\sdoing\sa\spartial\stable\sscan\sto\sfulfill\san\sIN\soperator\srather\nthan\susing\san\sindex.\s\sTry\sto\spick\sthe\splan\swith\sthe\slowest\scost.
- D 2018-06-08T18:22:10.089
 -C Fix\san\sassert()\sthat\scan\sbe\sfalse\sfor\sa\scorrupt\sdatabase\sand\sa\sstrange\squery\nthat\suses\sa\srecursive\sSQL\sfunction\sto\sdelete\scontent\sfrom\sa\scorrupt\sdatabase\nfile\swhile\sit\sis\sbeing\squeried.
 -D 2018-06-08T19:13:57.914
++C Merge\sthe\sbtreeNext()\sassertion\sbug\sfix\sfrom\strunk.
++D 2018-06-08T19:54:07.050
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@@ -1731,10 -1731,7 +1731,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
--P 09fffbdf9f2f6ce31a22d5a6df7a45f19a16628da622f12d6e33171cce09fb21
- R e63ef1b65ea2f09e13127dc0f6a98d71
- T *branch * in-scan-vs-index
- T *sym-in-scan-vs-index *
- T -sym-trunk *
 -R e90ea8c0bc9f17fa862de55346ad01f3
++P 1fa40a78fef4516c39b217bff67efe7e7d2077cca00aae0ef5c2c9cff94f008b 99057383acc8f92093530e216c621d40386a06fe98131ff0af6df524d80a6410
++R 56ae5d735c58aa67ec9684ecac6c800d
  U drh
- Z f877a3ca3a67b98847cd7a3f31dd6a75
 -Z dc7dec1a328a3fd8e94df605e9d025f7
++Z b50b0532bda90928b75cfc1466c6bb97

diff --cc manifest.uuid
index 6f59a009e5c7f20201995ad124c85cf12b5f571d,715434fba37fe25b95dbf98daf50d07296b76cb2..481057e48269ba5e28f280be27e7fc6cceba127a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1fa40a78fef4516c39b217bff67efe7e7d2077cca00aae0ef5c2c9cff94f008b
 -99057383acc8f92093530e216c621d40386a06fe98131ff0af6df524d80a6410
++11bd66e09035039fbfc4c5631196962dd3f2e6634f5123a7b2fec17aeaaab07b