Merge changes from trunk, especially the activation of the cell-overwrite

optimization for indexes and WITHOUT ROWID tables.

FossilOrigin-Name: a016144b0e0c41b89157ea7349aad376f34888edf9558f8fd0d529516c5d18fd

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 6e6145942a0dc20f866cc0e5997c0a7884779303,a782d8471857574f94580d89594de0f090c2b9fe..81a4bd556caad209887701e9581d24970cd9e07d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\senhancements\sfrom\strunk,\sand\sespecially\sthe\scell-overwrite\noptimization.
- D 2018-05-07T13:01:46.176
 -C Fix\sa\sharmless\scompiler\swarning\sin\sfuzzcheck.\s\sAdd\snew\sOSSFuzz\stest\scases\nto\sthe\stest\scase\slibrary.
 -D 2018-05-08T13:03:31.809
++C Merge\schanges\sfrom\strunk,\sespecially\sthe\sactivation\sof\sthe\scell-overwrite\noptimization\sfor\sindexes\sand\sWITHOUT\sROWID\stables.
++D 2018-05-08T13:32:02.123
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 96f7c276cecf864a8abcd1b8f2b0064e28284715fe06d3def14812c81668d847
 -F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
++F Makefile.in ab754e8fb9a83a308dfef344fd3a86bb93956d8ac0b4b461b96f6201a76f75f0
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 9e0a87c2a53a7353bf1ed03bf1f37cd8de70958811cf2138530e81a283d6f7e6
 -F Makefile.msc 681fb88cccf1fd58c0b9648f6a09b75332206ef72ca76012ad11699c320cec5f
++F Makefile.msc 887c54fc449b1880711e86f16f8afb1158a55884292895faeb3259a060e7e212
  F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
  F VERSION b7c9d1d11cb70ef8e90cfcf3c944aa58a9f801cc2ad487eebb0a110c16dfc2df
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -418,7 -415,7 +418,7 @@@ F ext/userauth/userauth.c 3410be31283ab
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 685600bbdceaf9c23cf093f910ef0387507f5069fb53fa851f508ff058235777
 -F main.mk 3f50dfe5cb4257c1aca96e417636ed51bc2561e71d31a21e9ccdf66feb912f43
++F main.mk ec0a9fd7686a9e4f11b47403a2ae5a9de6720e3b5e48b7292ad34cf625b9a249
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -437,8 -434,8 +437,8 @@@ F src/auth.c 6277d63837357549fe14e72349
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 10ac889edd61dea38b7563dc61722ea09bbdf5b9dd80b22d5f437d73bc717049
- F src/btree.h 0866c0a08255142ea0e754aabd211c843cab32045c978a592a43152405ed0c84
 -F src/btree.c abedb349c6624d3efa699b4431d5ef679838236527c694444b38ed48c494b39b
++F src/btree.c 9b2301d653bbdc521017eb685c7e83ce0d940195baffc2d53d04a76469bfd033
+ F src/btree.h 448f15b98ea85dcf7e4eb76f731cadb89636c676ad25dfaac6de77cd66556598
  F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
  F src/build.c 0c2be5839f22aa2938f217c6c6c2120d9fc96872a546a37541a8271541cb355e
  F src/callback.c fe677cb5f5abb02f7a772a62a98c2f516426081df68856e8f2d5f950929b966a
@@@ -1732,7 -1728,7 +1733,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 180516bf7bd5a61c11b1eef2c8c13ac63c7b00f821bb89393fc68d39852202de 5887d8beb502ad62689d31b850f46ab50831a1e9db36adf20d55ad45619d207e
- R 91c020c4417601e046dd03f4cd507fbf
 -P fd11fbd21893d520de5a2249f825ecb5839fa4943f5c207e9e9bf8b52f4e2695
 -R 341265b3833d05f56ac0f5a3c8e3d52d
++P cb3aa77802d45e9515e9c631af86f492fcd962c3302c79ba6f69213745fb0bb5 d2619746cb233f4be127a77988548dd1d90eebddf0d0ac9107913b240553e5d0
++R ca4ff6f8d8dc6a5b9a84ccde49d929d9
  U drh
- Z 67ccb61d54ee276a2e32b9a538cbd9c8
 -Z a9f407a471f5847cacaf3cf8ae748002
++Z 6da1ac6d0fa5c55402635ddd7695b2bd

diff --cc manifest.uuid
index 0f640514e87b2d13641ac999c03f05893493e734,30835e685676cf75f5b0b22441bedf7cd6332169..058fd5be41c5d24ea66393ebe19d042180d592dc
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cb3aa77802d45e9515e9c631af86f492fcd962c3302c79ba6f69213745fb0bb5
 -d2619746cb233f4be127a77988548dd1d90eebddf0d0ac9107913b240553e5d0
++a016144b0e0c41b89157ea7349aad376f34888edf9558f8fd0d529516c5d18fd

diff --cc src/btree.c
Simple merge