Merge the row-value fix from trunk.

FossilOrigin-Name: 1fbd7438611174aa594485241c8cc2f4ea6d09c57ef2fc16c8995e8061fdfdd6

diff --cc manifest
index 52be0a76b7312d12c2088ecbe05e9fb1cfc98a91,66bec473c0560fc6ccf7bf5ee5769f85315f31d1..69998370160e73d52986f03c1f8729640a037dac
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Do\snot\sallow\sgenerated\scolumns\sin\sthe\sPRIMARY\sKEY.
- D 2019-10-22T15:45:03.587
 -C Disqualify\srow-value\scomparisons\sfor\suse\sby\san\sindex\sif\sthe\sright-hand\sside\nhas\san\saffinity\sthat\sdoes\snot\smatch\sthe\sindex.\nFix\sfor\sticket\s[6ef984af8972c2eb]
 -D 2019-10-22T19:51:29.935
++C Merge\sthe\srow-value\sfix\sfrom\strunk.
++D 2019-10-22T20:16:04.350
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -477,7 -477,7 +477,7 @@@ F src/date.c e1d8ac7102f3f283e63e13867a
  F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
  F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
  F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
- F src/expr.c 7f2492f1a8190ae51e5cd2b8d64dd97d672de6270789daa70031c9243b101431
 -F src/expr.c e5dad5e67aa3caed02a41c4822d3df6a1b43fd4a19e93aa0f4a1709405c483fe
++F src/expr.c 738bcc441279eead08581ee8ee37d0dd56ded11361585b20b0af470c7c785291
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 6271fda51794b569d736eba4097d28f13080cd0c9eb66d5fcecb4b77336fae50
  F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@@ -1847,7 -1847,7 +1847,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 d38176e93a628e03f1bd8b689fbc4152a1495388da917c2d89cefed04353d2d6
- R a71a1c09fd9122c7a52773b96d8fa320
 -P c7da1c01f1f239e68c2173ac5748b8c5798271e43bdcee68f51f97cd0ca92bd5
 -R 92e3bc21380d8b35cad891a2258f3a1e
++P 1a54743a3d327efc8ecc45b9fde91ddfea3fca36408f9b753453c31f2e4cc69c 5c118617cf08e17a6edfdfba86e3fc49132a780990b68b52724c2aaeac85f506
++R 61ca5ca7599f2be6c4e9cd152abdc4cf
  U drh
- Z cf574256bc3dfd7405d0c5f301ba621a
 -Z d1b03389590fbac09e6d4dd5b27290df
++Z c94abd09133b87123ef5ae9e8b7dbfb2

diff --cc manifest.uuid
index fcbb946eadb6a63432499861626a7ffd09a18a77,4be46212ea08901eb68353e55eb62960be45a9fc..c432a3e36c670afb53a7befa462269e2d79cd20c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1a54743a3d327efc8ecc45b9fde91ddfea3fca36408f9b753453c31f2e4cc69c
 -5c118617cf08e17a6edfdfba86e3fc49132a780990b68b52724c2aaeac85f506
++1fbd7438611174aa594485241c8cc2f4ea6d09c57ef2fc16c8995e8061fdfdd6

diff --cc src/expr.c
Simple merge