Merge latest begin-concurrent changes with this branch.

FossilOrigin-Name: d33527d2231db9eda53124d3e11582a6b2eefa994eb7d9435fb349d3d8522ed7

diff --cc manifest
index ef8b42a231e514b48f1f4ac965473b30d4d4f5d7,84c414ba1f88914f8c8bf2c277af624c11c3b9ab..1dc8453b378eb49b765bf2c748002562306c0244
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sbegin-concurrent\schanges\sinto\sthis\sbranch.
- D 2018-07-10T15:48:39.705
 -C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
 -D 2018-07-12T19:28:43.961
++C Merge\slatest\sbegin-concurrent\schanges\swith\sthis\sbranch.
++D 2018-07-12T19:39:45.369
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@@ -504,7 -504,7 +504,7 @@@ F src/shell.c.in f1c79c537117ee61317a5e
  F src/sqlite.h.in 3818a7a023edbca14c433d85ca098e423120b403c89db7179a7dd47748054f31
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 9887b27e69c01e79c2cbe74ef73bf01af5b5703d6a7f0a4371e386d7249cb1c7
- F src/sqliteInt.h 66452e03bc8fb4417e0464e13c0919251f73658520ec3290d1ff30520cd2cefc
 -F src/sqliteInt.h 339bc14a899e31eb4c983c07e96ee9f0356fa0d76dcf2df893e2d0f72bdaf3cb
++F src/sqliteInt.h 24e6aaa22d7e35c2f5ad2cd3ba3fc6f8a961c0fe95f88e1b08fbd6fd9d668f10
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -563,9 -563,9 +563,9 @@@ F src/test_window.c 0d19b33e7a262d3b55e
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c 01e96d1b639c3eb0b9ef90616e766d453935c554f1f7aa86b6db937b79554b97
- F src/treeview.c 2d0fa21befa82f5c1ec419d20ea73dd845faffeb27ee1df9828e742985c35729
+ F src/treeview.c 462346b82a892316a62291791c77e3dd5f1927745fe4a44b846ab4fd16eb28c3
  F src/trigger.c 4ace6d1d5ba9a89822deb287317f33c810440526eafe185c2d8a48c31df1e995
- F src/update.c 0710fc44ac299470af2ed3b73053afa99cd3a93792226f2577b5426c59dcb9a3
 -F src/update.c 7b7c768dc415a8d2eb9fd2cea8b524cb29cf354f319700e22f94f262d3f507cb
++F src/update.c baabeae51e6af89eeb18548b333b2c28d0a6164ce50093702668ccd6b9bdc488
  F src/upsert.c 47edd408cc73f8d3c00a140550d1ad180b407c146285947969dd09874802bf88
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
@@@ -1162,8 -1160,8 +1162,8 @@@ F test/pagesize.test 5769fc62d8c890a83a
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 -F test/permutations.test 5c2167e03dc55ff697e11bb3abf10c66ba452e4afb2dbd85a2b144048355300e
 +F test/permutations.test 012ab6c80d77d8bbae2ac986990a570b0ace565cb7d80a3f160ab973b42ed88c
- F test/pg_common.tcl 3bf36b30d7b09e5896a1fb0268ace22f2ebfa91d07a422d8ffbf57551d9ce0dc
+ F test/pg_common.tcl 301ac19c1a52fd55166d26db929b3b89165c634d52b5f8ad76ea8cb06960db30
  F test/pragma.test 7c8cfc328a1717a95663cf8edb06c52ddfeaf97bb0aee69ae7457132e8d39e7d
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
@@@ -1759,7 -1757,7 +1759,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 be7004a971a174ae5c862cb3fa29f3586882d9ed1630d3e50e686d7310ccbc91 e9a3e8642e7acc8e63b35662ffae3a5a0da8d4f1ecefcb1db3110be19cbdab2b
- R 47be50798c4616a010a2e74703e49152
 -P e9a3e8642e7acc8e63b35662ffae3a5a0da8d4f1ecefcb1db3110be19cbdab2b 650a3fe03d61068e06f3097878a777ca8ed713a769444cdb3f8be7d1e19a0b83
 -R 766e1e062d052109c3dfecf240911193
++P af17432eb135895f9a55115c0eb364745715bb2dc14da01cbb2dc498e61c1853 6a00a34e198408d69d638a25763f64b8a5beec61a60affb4d344426a2e232d72
++R 6e09885c0de4b0f2a7c55adab7598e51
  U dan
- Z 5dd9ea69c1fd7265f2be69ef45731b41
 -Z a216610c9e8dd272a7214383e8ef9de2
++Z 722fc0fcd9e8e63a4a855d1ff336c5e5

diff --cc manifest.uuid
index bef69445913b230b586f9dac6cf449a28fcb371b,ec3b7f615821b2e9c12baa4cd16d21525e96b235..3e7325d06dc923d41c72b35e1688e662173b6abb
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- af17432eb135895f9a55115c0eb364745715bb2dc14da01cbb2dc498e61c1853
 -6a00a34e198408d69d638a25763f64b8a5beec61a60affb4d344426a2e232d72
++d33527d2231db9eda53124d3e11582a6b2eefa994eb7d9435fb349d3d8522ed7

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/update.c
Simple merge