Merge in version 3.31.0

FossilOrigin-Name: f418afa1bfde909bb90a60990e16be6beace9788319a5e1871e94b442fcd688c

diff --cc manifest
index bab0108aa03d23b6c7e7d507b5b2ca2efcd5d662,2589a4d0cafc6bb9540230a1972e04f8817ae041..174a6829f722fdc80e9a2917615c808931ee2e39
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\sfixes\sfrom\strunk.
- D 2020-01-20T15:32:47.769
 -C Version\s3.31.0
 -D 2020-01-22T18:38:59.573
++C Merge\sin\sversion\s3.31.0
++D 2020-01-22T20:02:11.282
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -532,16 -531,16 +532,16 @@@ F src/printf.c 9be6945837c839ba57837b4b
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c f0781c9e180028b279bc4ff079ad54f4727223d470c8d2343643fcaf79b67740
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c 1b787876c0f3052ccd27490a350ab181281e9833f455ee273bee0a0c8a94765d
+ F src/select.c 3f7aecf64b08b018b89e4fe16ea621cc9a0e3f3801e9e5638cfe1a6035fa1581
 -F src/shell.c.in c2e20c43a44fb5588a6c27ce60589538fbf4794fd7686f5b2598eca22eaae1fa
 -F src/sqlite.h.in 75d0304247a2154122d6d06f12219c1e29291d72304f0eeef4c1ec6b1409b443
 +F src/shell.c.in 8a06de3e55e49df49eca5132dacda0057b397d3faeca8a3f943c9b536af35d7f
- F src/sqlite.h.in 64750052b9aba9f17659d760dc2040650e234e1566e48d7a61d8742a5247e958
++F src/sqlite.h.in ceebdc4c3119b2634e49f04be747515a4d2d551deb15c6d046a343471c465adf
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h b0f776a0d042b23b6bcbb6b0943e8a3768c7f0b438a275e7168f0204e223a4db
 -F src/sqliteInt.h 7a29ba700a51eeb925731749a570cf3859f6a58ed94797ecf47508875b0ba279
 +F src/sqliteInt.h be6a29e1fc0b9340b412a616b1b685dfa057ac3c6817b2bdcd3b071d4d4fa355
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 -F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278
 +F src/status.c f6e2b6c37873620ce2cb597f5606a1c9adca4c0db1ff3a08a37231e920d21985
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
 -F src/tclsqlite.c 97590069efaba5a4928ecffb606e3771dd93ee8e6bf248a62a6507c37a2b2e46
 +F src/tclsqlite.c 400c8d6d7b3d79d0ccbf37966ad8795d23eb994b91d9b9d16e03ffe3378cc3d3
  F src/test1.c 4d0ab2f67053a4fff87d1d3586ecc0e5322a1fc45dd4119ab11dc96de44f17a1
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -1602,14 -1593,13 +1602,14 @@@ F test/triggerC.test 29f5a28d0fe39e6e2c
  F test/triggerD.test 8e7f3921a92a5797d472732108109e44575fa650
  F test/triggerE.test ede2e4bce4ba802337bd69d39447fa04a938e06d84a8bfc53c76850fc36ed86d
  F test/triggerF.test 5d76f0a8c428ff87a4d5ed52da06f6096a2c787a1e21b846111dfac4123de3ad
- F test/triggerG.test d5caeef6144ede2426dd13211fd72248241ff2ebc68e12a4c0bf30f5faa21499
+ F test/triggerG.test 2b816093c91ba73c733cfa8aedcc210ad819d72a98b1da30768a3c56505233e9
  F test/trustschema1.test 4e970aef0bfe0cee139703cc7209d0e0f07725d999b180ba50770f49edef1494
 -F test/tt3_checkpoint.c 9e75cf7c1c364f52e1c47fd0f14c4340a9db0fe1
 -F test/tt3_index.c 39eec10a35f57672225be4d182862152896dee4a
 -F test/tt3_lookaside1.c 0377e202c3c2a50d688cb65ba203afeda6fafeb9
 -F test/tt3_stress.c c57d804716165811d979d4a719e05baccd79277f
 -F test/tt3_vacuum.c 1753f45917699c9c1f66b64c717a717c9379f776
 +F test/tt3_checkpoint.c 9a7fe00e07700af027769d83ef67ab727927ae6c865ecdc71fe8011194200c53
 +F test/tt3_index.c 95592839426dc85ce5a7a57b41be2cbf3c2ec3457b9cd841a06ed5877f712c7c
 +F test/tt3_lookaside1.c 2ddd99bfffeef288f0786827ef68f912f6f47ce3d3184e62f05808d8e13b920e
 +F test/tt3_reuseschema.c 4d52e141f89f009028d8ab0bd1f0697d0edffa94bafc1fff0f7ad4d9d9baa549
 +F test/tt3_stress.c bbd430f23fa64f466ea8f212756f5f7135a2f8ff5accad85550c0ba73be76b16
 +F test/tt3_vacuum.c ca42adcf8a671abbe34338b828464269e21758a6b4857b889dabfd39a3206d98
  F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
  F test/types2.test 1aeb81976841a91eef292723649b5c4fe3bc3cac
  F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
@@@ -1867,7 -1857,10 +1867,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 9830a44bc65e1176ca11ae84d7a291e6986662d2bbac5e352ae6e2423358c60b 63d886f4ce3c770498b8bdad45b04143a3f63197d81793bde107450aba4a9c87
- R cd491140da36b0a76a65a6104a079ed7
 -P 4daf94d83319231e42243625c804d5db2d14f10fa5ea1a1f358c3603c47b955b
 -R 5a98666c879217368b8f21c26d062d92
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.31.0 *
++P 9c920bbad3d0a79279e8ff89a01d0f197c77d0a530ac51c57e57fe6db316c905 f6affdd41608946fcfcea914ece149038a8b25a62bbe719ed2561c649b86d824
++R 10ec85502262ba6912cf99f708e66f9a
  U drh
- Z d912436ab0c4dcabadc5679d89fb1a75
 -Z 51c630793e0eec473e1274a795f77643
++Z 59809bad8fd3b7bf9870fc9ca6d6d41d

diff --cc manifest.uuid
index 21ce272dbf5b979ccaef59db75d9057b6786534d,f3f9cddef5034075f295018ee68dfc361744eb35..bf833048930ee1162cb2ac19e03029b0e9569cc1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9c920bbad3d0a79279e8ff89a01d0f197c77d0a530ac51c57e57fe6db316c905
 -f6affdd41608946fcfcea914ece149038a8b25a62bbe719ed2561c649b86d824
++f418afa1bfde909bb90a60990e16be6beace9788319a5e1871e94b442fcd688c

diff --cc src/sqlite.h.in
Simple merge