Merge all the latest changes from trunk.

FossilOrigin-Name: c27cd8a8127b81d3176f6a5b9915c9b3c69574fb

diff --cc manifest
index 7d07fb38d67e68eac504d2f2e114a094ffd3a7d6,683b75d2aef36109b93a75ecf524f8adce10574f..4333aa5ff1fb6c95528e7abd1f4d84cf374e59c3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\sbuilt-in\saffinity()\sSQL\sfunction.
- D 2016-12-26T00:18:36.252
 -C Defer\ssize\schecking\son\srow-value\sassignments\sfor\swhen\sthe\sRHS\sis\sa\sSELECT\nuntil\safter\sthe\s"*"\swildcards\shave\sbeen\sexpanded.
 -D 2017-01-03T13:45:22.450
++C Merge\sall\sthe\slatest\schanges\sfrom\strunk.
++D 2017-01-03T14:30:28.465
  F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@@ -338,14 -338,14 +338,14 @@@ F src/build.c 9e799f1edd910dfa8a0bc29bd
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
- F src/date.c b48378aeac68fa20c811404955a9b62108df47d8
+ F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e
  F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
  F src/delete.c c8bc10d145c9666a34ae906250326fdaa8d58fa5
- F src/expr.c dfde7bf6d3293c34b975aef24a7b9e4f6dbe89da
 -F src/expr.c 59418cecc99adfb5cdd6c088ff38c1dde827e077
++F src/expr.c 3cf3bb3b5de2494d0f7b30c999984fd2918b4ef5
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae
- F src/func.c 18193418066b4a46df0678167a61e2ecb532449e
- F src/global.c dcdb89f30b7aa531c5660030af106bc5bc48ef2e
 -F src/func.c d8582ee91975975645f206db332c38f534b783ad
++F src/func.c 04350956b6e45800f71e02e0ffeae2a35aff2634
+ F src/global.c 4a34512d82fc5aa13c802db06bcfff5e1d3de955
  F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
@@@ -393,7 -393,7 +393,7 @@@ F src/shell.c 6095531aa900decdaa765e0f3
  F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 5a4ac95a34d9d323b2276ae1ed2b3eaafce6c97e
 -F src/sqliteInt.h 943ba94907e64b4325ff99583bdca166a8278331
++F src/sqliteInt.h 2c22eae7a29f17e0dfee9737d4844d7c08cc38cd
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -1539,10 -1541,8 +1541,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 8c5187f69d719b69aa6eaf2dc8f89243e5979222
- R b3d06bee0b628897cfc6aea60fc78deb
- T *branch * affinity-sql-func
- T *sym-affinity-sql-func *
- T -sym-trunk *
 -P abc27b6023e28a717bfa15648ddc152bda9c7b96 696219b11049930cdbc38f574820f4bbaf8621bb
 -R 8e229780f94246cbc66f37b63195235a
 -T +closed 696219b11049930cdbc38f574820f4bbaf8621bb
++P 57e40e1cb1bcd3dd8473d2fdeecc9c7ff3d6192b 36944be6be5c42096f5da84187ff203af26b08ae
++R e122a5b19a6af1a9b03b2065c0a3a3fe
  U drh
- Z 89d8ee615380053a8bde91353136b95e
 -Z c02d09c2f2bfe5e823a2e301838383db
++Z 5f2d809963b79f73c941be08881302f0

diff --cc manifest.uuid
index aa72dce7c8afe16b238a946e9fd0907a70ff27bb,64dc1693aea813f19ed8aea009dfb385373fe426..34459e334c1c4eccbf9c5462b2bc9fec5eb74755
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 57e40e1cb1bcd3dd8473d2fdeecc9c7ff3d6192b
 -36944be6be5c42096f5da84187ff203af26b08ae
++c27cd8a8127b81d3176f6a5b9915c9b3c69574fb

diff --cc src/expr.c
Simple merge

diff --cc src/func.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge