Merge updates from trunk.

FossilOrigin-Name: 86ab8643969bd2e51a257d80da9316c668437f7b

diff --cc manifest
index c0896b3d7e87e6fc7c2799d39551eb307cc75f25,b4be055c2830dd7c088720b6c8bf8e41c77e8013..23d5324bc804e766b48ec56a0eacc49f8ea3cde0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Change\sthe\sxGetLastError()\smethod\son\sthe\swindows\sVFS\sso\sthat\sit\scontinues\sto\nformat\san\serror\smessage\s(if\srequested)\sbut\sreturns\sthe\ssystem\serror\scode,\nrather\sthan\san\sSQLite\sstatus\scode.
- D 2016-03-17T19:28:19.609
 -C Change\sthe\sway\sfts5\sinternally\sallocates\ssegment\sids\sin\sorder\sto\seliminated\snon-determinism\sfrom\sthe\smodule.
 -D 2016-03-21T09:56:19.361
++C Merge\supdates\sfrom\strunk.
++D 2016-03-21T10:49:49.647
  F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@@ -352,15 -353,15 +353,15 @@@ F src/resolve.c b8f7174e5f8c33c44ded3a2
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
  F src/select.c 6dd2097bb158efe3b8d68683dcc3b4a49e907a34
  F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
 -F src/sqlite.h.in 0235586b3fb639e85998d495c90f007657fd82af
 +F src/sqlite.h.in e877f141b15ef68ef28f84714e69d7234f9a071e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 -F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
 -F src/sqliteInt.h 751ced73be8c449a75e075e0545cdd832ed3591e
 +F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
- F src/sqliteInt.h 5256653cc049ad48e03189abe106cb45f5eaf2c8
++F src/sqliteInt.h 4eb80a9b9a512180a9739f99d754915e03d8091a
  F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 4bf3bea9b03aeac176ac114700f35f76a1de4c8a
- F src/test1.c 289e7dab5b1aec4f4d44f2cc84972c97458d739f
 -F src/test1.c 941f1cb50a601c30fd426a381e783b863c9d7d13
++F src/test1.c 7187b7e924bfc97780e6fd2a40dad94a32bddca0
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -414,9 -415,9 +415,9 @@@ F src/treeview.c e4b41a37530a191579d3c5
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
  F src/update.c 56b3db7edff0110360a12b76af97c39ebe3ea8b8
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 -F src/util.c 34ef7be420f82415ec48131404995ddb6ee7502f
 +F src/util.c c3fc5193e6f039fa61afbcc0db87d5a5d563a18a
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
- F src/vdbe.c 8cf45bb8da77d39f55d108e759d15a57acd0255c
+ F src/vdbe.c 3b542ffd5b6aaab55255ec3801fc86dcbfaea543
  F src/vdbe.h 6f44193e7be52fd5f7c308175a936555b1e6b101
  F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
  F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
@@@ -520,9 -521,9 +521,9 @@@ F test/busy.test 76b4887f8b9160ba903c1a
  F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
  F test/cacheflush.test af25bb1509df04c1da10e38d8f322d66eceedf61
  F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738
- F test/capi3.test 84ab8993016cd7edfe91af58a04def17075ec9b9
 -F test/capi3.test db0731f6e2a94f96c6d4c478fedef4e0c077026c
++F test/capi3.test 860dafdc04f651a67781018cb1a0b179d22d7d15
  F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
- F test/capi3c.test 06f6261f9e9b4ef6f76afcd9900f3665408af1c8
+ F test/capi3c.test b28ec47692f0fc50eb61b2d464d8d52e816b3732
  F test/capi3d.test 485048dc5cd07bc68011e4917ad035ad6047ab82
  F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
  F test/cast.test 4c275cbdc8202d6f9c54a3596701719868ac7dc3
@@@ -1456,7 -1457,7 +1457,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 185bc8644c806597194dc532a4d547a03a2dedaa
- R d7bafa1f512c1236fc42737f63cfb05e
 -P c39081e878faccc8552141afa5732a2bf2f77570
 -R b7f851b6f7c0c6dc2d06642c2058dff4
 -U dan
 -Z 052aba56922a1e224a7195cfbf595d27
++P 1602f6b53698bd3a1a4be218c2e3145dd895f1f1 d6e2637df16764aa9723a30ea2eb8a631d28cb2b
++R 612a3877b08babb8ce38fd27cb203dde
 +U drh
- Z df3bbf22437c6fe25ac3bbf281848b7c
++Z a4bea0f6db7341ce1f534f224a30953a

diff --cc manifest.uuid
index 688543bf040315b4a117274e20fc59d08de8fcfa,775d397701531a4bcb0686e479808235cede6387..a54112ab693a026848805b832574f319c2be86ec
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1602f6b53698bd3a1a4be218c2e3145dd895f1f1
 -d6e2637df16764aa9723a30ea2eb8a631d28cb2b
++86ab8643969bd2e51a257d80da9316c668437f7b

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc test/capi3.test
Simple merge