Merge version 3.31.1

FossilOrigin-Name: d250d085fa4bd6509ab074d15f1c11fcc15d0cc150e5e429b191eb5a92e0ac1e

diff --cc manifest
index c0673697716652938fe3023ecd3ed0963d49b173,cab43f3b0f09fdd440cde091c9346f0c47937d1e..6b473624c872180e081f5676c4df049538b2c891
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sversion\s3.31.0
- D 2020-01-22T20:36:33.266
 -C Version\s3.31.1
 -D 2020-01-27T19:55:54.490
++C Merge\sversion\s3.31.1
++D 2020-02-01T00:08:28.488
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -496,9 -493,9 +496,9 @@@ F src/hash.h 9d56a9079d523b648774c1784b
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 2fe4d7f67078a68650f16e4efe73207899e21702e6b9d2e8ad1894c76dcad352
 -F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 +F src/legacy.c f69590f141eabd2dc787710264ccfa4374fac991ea1ca2120a2550c0ffe32afd
  F src/loadext.c 8cd803f1747c03a50b32fe87ebfb5851998d0cdafefe02737daa95e0616b42bb
- F src/main.c 33f6f5f0d3fe200f766173c0dbe1fefe440bc9a3be274f6813479d938dc75962
 -F src/main.c ffaa1308ee8ad7cf70bddc9a9fe2d2d66799e534b12ec876562d26a33a30d745
++F src/main.c 4adc083bab6d17086e11121341d981020d6ae14c078ad83882fe9a317e36c969
  F src/malloc.c eaa4dc9602ce28b077f7de2eb275db2be270c5cc56d7fec5466301bd9b80e2f5
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -518,11 -515,11 +518,11 @@@ F src/os.c c862e5d629d7ad8f762b9f67e716
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c ad7640c04eed946052a3b12856362a773d0a717696707313037186df0e2b59f2
 -F src/os_win.c 035a813cbd17f355bdcad7ab894af214a9c13a1db8aeac902365350b98cd45a7
 +F src/os_unix.c a796deff42a187cc7820dc7b2d9d07426196e558e49f40d0f7b0b1f4e3e3ff73
 +F src/os_win.c b393ae2303d051684f4bdaec3984c9c9594f10adc629689108ed9aa5ab219d17
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 4c74d95cb72b9c4dd01788f48347059225221aa2f5b4a93984f53aab15d20d05
 -F src/pager.c c0bca72aa3f7b1cf521a9f350fcf8e5975ebf98da7dbb03492be876b0f053781
 -F src/pager.h 71fe1d5016ec54d0cc5d344cd474e563450b438c59f535e8c1ec8a13b1373f14
++F src/pager.c bbb917ee96d567bc1f699efeda1d7965d44010e46b579f5137747ba25c620dd2
 +F src/pager.h 02f34df97a166ee5096560dc00d2acec4d7cf7c63e95ba21cd00ad60fd5d95d3
  F src/parse.y c8d2de64db469fd56e0fa24da46cd8ec8523eb98626567d2708df371b47fdc3f
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
@@@ -536,11 -533,10 +536,11 @@@ F src/resolve.c f0781c9e180028b279bc4ff
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
  F src/select.c 3f7aecf64b08b018b89e4fe16ea621cc9a0e3f3801e9e5638cfe1a6035fa1581
  F src/shell.c.in c2e20c43a44fb5588a6c27ce60589538fbf4794fd7686f5b2598eca22eaae1fa
 -F src/sqlite.h.in 75d0304247a2154122d6d06f12219c1e29291d72304f0eeef4c1ec6b1409b443
 +F src/sqlite.h.in ae9513f9bfc331acdac8a108486ea3b6d91447e5c2e948f6c8862f1b10f4e284
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h b0f776a0d042b23b6bcbb6b0943e8a3768c7f0b438a275e7168f0204e223a4db
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
 -F src/sqliteInt.h 7a29ba700a51eeb925731749a570cf3859f6a58ed94797ecf47508875b0ba279
+ F src/sqlite3ext.h 27951f294f29cd875c6027f2707d644ef99f469bd97514568b5a8581a114db8c
 +F src/sqliteInt.h 7fbd095709d25a70e6ff5f31e422f21b34001f91a74dde43ba01ad577c0adfe9
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1862,7 -1857,10 +1862,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 dadedf41c7cced0cea5c69584ff11405c2fc53518c7ddbea2e4e51cc44b4cd0a f6affdd41608946fcfcea914ece149038a8b25a62bbe719ed2561c649b86d824
- R 94ecb94552bc20bc10f60600fda897cb
 -P 6fb9a8fb85486a8fccc462856316ef523450c23a7a7a81c8dfb323fbe809f8f5
 -R bf075f6bcc1758c5c1ecd13052997456
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.31.1 *
--U drh
- Z 47e099c161019264a14f4b1792d480bf
 -Z 7c50801eed3eaef969e028ef5a0a641a
++P 0eae87ad11107f420b00958fa5a9b8037b775f0586e9fb1e2d5f6c04d7ae4afc 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6
++R c2517ca13f1f9419d56182d6cc87f6b4
++U numist
++Z eba5af3ae194a88d3d29362000183ff6

diff --cc manifest.uuid
index 4d1205e3f66e58ca158025905e2699ed90d8e96f,e7395de79b386bc1e215c6b8d0ed7672dfd9e301..144adef4fedf6844bb608c8b1617d99d1c492053
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0eae87ad11107f420b00958fa5a9b8037b775f0586e9fb1e2d5f6c04d7ae4afc
 -3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6
++d250d085fa4bd6509ab074d15f1c11fcc15d0cc150e5e429b191eb5a92e0ac1e

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge