Merge the sqlite3CodecQueryParameters() fix into trunk.

FossilOrigin-Name: a812f533693a3605f297199ae0320d663e872208675e86860c5c1803943943aa

diff --cc manifest
index c867420567f47a4ba455f057ef94877e831edf2a,7e862f7487bc37dd55b54c16718c89a824ae198d..02aec93065c89d4f8cebdb94f14a1ed1eec7ad8f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sminor\stypo\sin\sa\scomment\sin\sthe\sbtreeinfo\sextension.
- D 2020-01-31T14:52:19.945
 -C Fix\sa\sproblem\sin\ssqlite3CodecQueryParameters()\sthat\swas\sintroduced\sby\sthe\nquery\sparameter\sencoding\schanges\sfor\sthe\s3.31.1\srelease.
 -D 2020-02-01T13:30:39.095
++C Merge\sthe\ssqlite3CodecQueryParameters()\sfix\sinto\strunk.
++D 2020-02-01T14:20:35.510
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -492,10 -492,10 +492,10 @@@ F src/hash.c 8d7dda241d0ebdafb6ffdeda31
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 -F src/insert.c 2fe4d7f67078a68650f16e4efe73207899e21702e6b9d2e8ad1894c76dcad352
 +F src/insert.c 2d130e0480cff4c20946c932fcf0cbf97e52b200c22c7f4f51b47b739994ffe5
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 8cd803f1747c03a50b32fe87ebfb5851998d0cdafefe02737daa95e0616b42bb
- F src/main.c b7234b706ef72c4aa99e8e379284450b57ff83006aa33c36c1cceec0a6488e6e
 -F src/main.c a82239262ef4d926fc00824e1ab4fdb958496d6efe9ee8ebd3e37d6005deccc4
++F src/main.c 8f12ce22aee8b5dd8fbf74b5f5c4dfbbe7b2c05c61c18d6120e7b8c640ca8420
  F src/malloc.c eaa4dc9602ce28b077f7de2eb275db2be270c5cc56d7fec5466301bd9b80e2f5
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -1858,7 -1857,10 +1858,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 dcb4838757ca49cf149a6e883b3eb0ac8a075147387a078280dfabe39b1a3e8d
- R 850a1a50cf9a586330b7de9f65d86f73
 -P 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6
 -R 37dff97ea1827bf789931484e75996b9
 -T *branch * branch-3.31
 -T *sym-branch-3.31 *
 -T -sym-trunk *
++P b5a66d10f4bbaf10def7b50b9ed98b05b41bb2c2af5ab9a90f6cda61169ab123 cc65ca541265bd7061ed8f5ec9a54f3c384c41019c5ea1c68dcaabeff3495839
++R 38e4d50870b636b26dd03f2e2c8fedf3
  U drh
- Z d704c4cde3f1b18ca7293e6622846334
 -Z b11b538d7cc74f2de7b61f8de517a681
++Z 53e4c409bce656a6e52d30f174d1ac30

diff --cc manifest.uuid
index 3b05a69d9f3bc280bdfd7a641a3edc34a9c4595c,25bc060e6647889b18bf812ababb9a80484de98d..68f011427ab1e29e3e78241159f77c30cbd75118
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b5a66d10f4bbaf10def7b50b9ed98b05b41bb2c2af5ab9a90f6cda61169ab123
 -cc65ca541265bd7061ed8f5ec9a54f3c384c41019c5ea1c68dcaabeff3495839
++a812f533693a3605f297199ae0320d663e872208675e86860c5c1803943943aa

diff --cc src/main.c
Simple merge