Merge all recent changes from trunk.

FossilOrigin-Name: 3d04b2cd7a68cf58ae739a5c6813562130e5c50c800c208c82769f76037f8f66

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 2d86bca364adbb30063e8bf6b4585f1adaec2208,b74ca835a240a34b3e3fe05f8fb3406cbfd137e5..0a43f4736cc111c6585085adc265b8bfd2fb4318
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\senhancements\sfrom\strunk,\sincluding\sthe\s--preserve-rowids\soption\nto\s.dump\sand\sthe\s.sha3sum\scommands\sof\sthe\sCLI.
- D 2017-03-08T18:37:57.666
- F Makefile.in 0c27f4cee5d1d12f3a8d8fa88500c7264d2f4b36
 -C In\sthe\soutput\sof\sthe\s".dump"\scommand\sin\sthe\sCLI,\squote\snewline\sand\ncarriage-return\scharacters\susing\sthe\schar()\sfunction,\sso\sthat\sthey\sdo\snot\nget\seaten\sby\send-of-line\sprocessing\slogic\sin\sthe\sOS\sor\sin\sother\scommand-line\nutilities\sand/or\slibraries.
 -D 2017-03-13T18:24:06.748
 -F Makefile.in 2dae2a56457c2885425a480e1053de8096aff924
++C Merge\sall\srecent\schanges\sfrom\strunk.
++D 2017-03-13T18:31:14.352
++F Makefile.in c75fd72f81bb47a1df670516b9ea271b8d836acc43032fe6cfc96563b8783029
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc ec6e29fe200869fd03cc41679a055c0f17ec9ea1
 -F Makefile.msc 9020fa41eb91f657ae0cc44145d0a2f3af520860
++F Makefile.msc f8501d6bcb057964cb48af4406d87bb797630d41d3fe85a3569e3397bdddeeed
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 3605fa447e4623f5ff4a6adc97b1fde9a257b8f2
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -326,7 -322,7 +325,7 @@@ F ext/userauth/userauth.c 3410be31283ab
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 83913b36dafe750eb9c764bf2dba61c3aa8d3ee5
 -F main.mk 0ec10b604f4668f7e85a358954babe75c94dc0d5
++F main.mk 172c83775a403c826283713bfdd10b5d29b9aafa80d909ef54c1bb9e398b81d3
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -365,10 -361,10 +364,10 @@@ F src/hash.h ab34c5c54a9e9de2e790b24349
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 3ed64afc49c0a2221e397b9f65d231ffbef506fe
 -F src/legacy.c e88ed13c2d531decde75d42c2e35623fb9ce3cb0
 +F src/legacy.c b143b1fe422524cb29cb5ac907c8a44684333d75
  F src/loadext.c a68d8d1d14cf7488bb29dc5311cb1ce9a4404258
 -F src/main.c 158326243c5ddc8b98a1e983fa488650cf76d760
 +F src/main.c 0c3fecdde19dc698bb59d1901a8696a6be36ff64
- F src/malloc.c d0a1474236486165bcb349af82e2a6560178bf7b
+ F src/malloc.c 89c98e3619d362dcffa5c1c639b364b65b474751
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c fd7cd6fe21d46fe0a4186367dd8dc26d87b787eb
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -402,13 -398,12 +401,13 @@@ F src/printf.c 67427bbee66d891fc6f6f5aa
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c d12f3539f80db38b09015561b569e0eb1c4b6c5f
- F src/shell.c 1160c054a483d15213ceb70fdbc383b07eebdf78
+ F src/select.c 2496d0cc6368dabe7ad2e4c7f5ed3ad9aa3b4d11cd90f33fa1d1ef72493f43aa
+ F src/shell.c 353f3cebb938099577494326e2853010512e0625
 -F src/sqlite.h.in 4d0c08f8640c586564a7032b259c5f69bf397850
 +F src/sqlite.h.in 329de1e75636972ba4b9388971ba47d3e2cb9116
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 -F src/sqliteInt.h df268ce1d04df042cf43b557d2309eb0b71e86c4
 +F src/sqliteInt.h 85eba6f13086a33be08ef7237af7b8be9884d0f3
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -481,10 -476,10 +480,10 @@@ F src/vdbesort.c eda25cb2d1727efca6f786
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c 007513c2ef52472fcdea6a741683d50662e82790
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 -F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 +F src/wal.c dad2233125cf918e8eced1ec9695525b9894cf7d
 +F src/wal.h 1598818fe90532a622ecdec5baa959f94e10062e
  F src/walker.c b71a992b413b3a022572eccf29ef4b4890223791
- F src/where.c 1a3a8adb717a20f17c186f3baa22b0b5f3a5ab13
+ F src/where.c e815093e5ee039b6b4eb19b646d22deb1a3a523f
  F src/whereInt.h 2d50c2b74a33be44cb68fdecee30b4d93552f1f4
  F src/wherecode.c 677e95413c472c0b413023b6b69a47f40fce1b04
  F src/whereexpr.c 130cdd1a43af71b19755270fb1224874cf55158c
@@@ -647,9 -642,8 +646,8 @@@ F test/cursorhint.test 7bc346788390475e
  F test/cursorhint2.test 8457e93d97f665f23f97cdbc8477d16e3480331b
  F test/date.test 9b73bbeb1b82d9c1f44dec5cf563bf7da58d2373
  F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
- F test/dbselftest.c b2e6cfac59066dbcb7334b66304bb15a5508dd42
  F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
 -F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
 +F test/dbstatus2.test 16194c6aa2d8a050f227890d2ed1eb5f8dcb8300
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
  F test/delete.test acc38fca8ee4851467705b1c2cfea64cd26667e5
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -960,12 -953,13 +958,13 @@@ F test/mallocI.test 6c23a71df077fa5d387
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
  F test/mallocK.test 27cb5566a6e5f2d76f9d4aa2eca45524401fd61e
  F test/mallocL.test fb311ff80afddf3b1a75e52289081f4754d901dc
 -F test/malloc_common.tcl aac62499b76be719fac31e7a3e54a7fd53272e7f
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
+ F test/mallocM.test 491001d1e273233048d265ec6d38fdd23745b0284f0c93bc98c94b64451c9c28
 +F test/malloc_common.tcl 8d368ee0b9d77c9643b174448f137c18b68e49f4
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
 +F test/memdb.test c46019291625650d71416e770f6a54a281a1a98f
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 -F test/memsubsys1.test 6d268d0ae90f8d61a2356a1838665654d83de518
 +F test/memsubsys1.test b6037a276f95c88d029868b12c80ff08dbb78700
  F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
  F test/minmax.test 6751e87b409fe11b02e70a306d846fa544e25a41
  F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
@@@ -1013,10 -1007,10 +1012,10 @@@ F test/orderby7.test 3d1383d52ade5b9eb3
  F test/orderby8.test 23ef1a5d72bd3adcc2f65561c654295d1b8047bd
  F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
  F test/oserror.test b32dc34f2363ef18532e3a0a7358e3e7e321974f
- F test/ossfuzz.c e469138f4be3e92df6173b79b3b216ab6e17b407
+ F test/ossfuzz.c 6dc75478809cfbd4609409a87179ddc2ffaa092e8adb27c1982c5a944a7dd81f
  F test/ossshell.c d9f1a6f43e7bab45d6be857a5800f5d4a1861db3
  F test/ovfl.test 199c482696defceacee8c8e0e0ef36da62726b2f
 -F test/pager1.test 841868017e9dd3cb459b8d78862091a7d9cff21d
 +F test/pager1.test 15d423765637d8cd54b025f90ed6c8dc311e2fc3
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -1569,7 -1563,8 +1568,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 1650c3f468e6fc9bfed3dac469b32ae9f501f64e 2ea300fb8f7c497f3f092dc91f4305d8431c27d9
- R 13cb32973b901948d487c7a2cf4ace2c
 -P 9034cf7efc603864f51e931c7dc4fbbc2d01904e951e78c88d4d80f9936250e8 8b2954dd8376e2de985cf5dedeb6eec32c430505
 -R 73c5fbe608fb0e20ee39173a6198ea04
 -T +closed 8b2954dd8376e2de985cf5dedeb6eec32c430505
++P 9b43917380ed60f11ebd8210bb7b9e444e1b9b0c 68f6dc7af1013f296a11db14c007cc13cc3fe56832848bfed835ed8f74dcc676
++R a69508ffc3dce9a8eb7a6c4125dfe03a
  U drh
- Z d09f80e1fd5da95e763dcf07b95310d9
 -Z 5e4a79f0eabba6013ee57f9716ad3797
++Z 80f668a2a3637e507006793fa87f79f8

diff --cc manifest.uuid
index 0a112108d8afd9b8f63837718dce6cd5a5f40d8a,35073a3308f666523af8d88077b3e51270fe50d6..5966bfcd3c1a365aad6f74e3956e6036743ef226
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9b43917380ed60f11ebd8210bb7b9e444e1b9b0c
 -68f6dc7af1013f296a11db14c007cc13cc3fe56832848bfed835ed8f74dcc676
++3d04b2cd7a68cf58ae739a5c6813562130e5c50c800c208c82769f76037f8f66