Merge the sqlite3_system_errno() change from trunk.

FossilOrigin-Name: 063f1b3705625b2f115af8e909d86705b892b529

diff --cc manifest
index 2838f638bf064393aee19e6311100e37abcf3b94,6c35067176c776595b0fb51866af82c8ba2537a7..8ed7c0648ecb076397c0363d3de3d735518e4835
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Fix\sa\sVDBE\sregister\sallocation\sbug\sexposed\sby\srecent\senhancements\sto\nPRAGMA\sintegrity_check.
- D 2016-03-19T00:40:06.384
 -C Add\sthe\ssqlite3_system_errno()\sinterface.
 -D 2016-03-21T14:46:37.265
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Merge\sthe\ssqlite3_system_errno()\schange\sfrom\strunk.
++D 2016-03-21T14:52:04.010
 +F Makefile.in 3aee0ba902634c52493914df76b40cedcd99b678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -242,12 -242,13 +242,13 @@@ F ext/rbu/rbudiff.test 2df0a8a7d998ecf8
  F ext/rbu/rbufault.test cc0be8d5d392d98b0c2d6a51be377ea989250a89
  F ext/rbu/rbufault2.test 9a7f19edd6ea35c4c9f807d8a3db0a03a5670c06
  F ext/rbu/rbufts.test 828cd689da825f0a7b7c53ffc1f6f7fdb6fa5bda
+ F ext/rbu/rbuprogress.test 2023a7df2c523e3df1cb532eff811cda385a789a
  F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48
- F ext/rbu/sqlite3rbu.c 5956f8bee63b5ab2b04e65c1801ea0f5920dac92
- F ext/rbu/sqlite3rbu.h 0bdeb3be211aaba7d85445fa36f4701a25a3dbde
- F ext/rbu/test_rbu.c 4a4cdcef4ef9379fc2a21f008805c80b27bcf573
+ F ext/rbu/sqlite3rbu.c 007fc4db8c0b95c7ef10162b5864921ef5cc8106
+ F ext/rbu/sqlite3rbu.h d7cc99350c10134f358fe1a8997d9225b3f712b2
+ F ext/rbu/test_rbu.c 3505641a78b723589b8780d5f9b2faeeb73e037d
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 -F ext/rtree/rtree.c 0b870ccb7b58b734a2a8e1e2755a7c0ded070920
 +F ext/rtree/rtree.c 428878f7b016639149f6c95cef5741f835554765
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 96a80c08440c932cd72aac50660e7af2612d2cda
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -316,9 -314,9 +317,9 @@@ F src/hash.c 4263fbc955f26c2e8cdc0cf214
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 723d5d708cdb61bdd47c00b9f07c75be45aefc09
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
- F src/loadext.c 9e2a41adcaff16ebc1ebff1f336cbf33de55396f
- F src/main.c aa4809ab4ca3d6260522d4be5bbe0a50eccf6032
+ F src/loadext.c e70f8f9e97624a232870ea5486e682c813ac3002
 -F src/main.c f6c6e61bfd4cc9306a737d0c5c3f1e0eaf6086e0
++F src/main.c 7a89a9399b890865c25abc066c97fbd466df36d4
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -333,15 -331,15 +334,15 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e
  F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
  F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c 4bcb5173e2b51e254397fbed13ed384eb2dd75bf
- F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 -F src/os.c ca10edb445ad2c5fdc7285b49d72bcdf261fa23e
++F src/os.c 3aee4b94665c127b3a90d1495e0af7b84d3d16a5
+ F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 91e743e4fc65d95604e5d1fae4cb692754e99a65
- F src/os_win.c 57a720ebb75dc55a1af042afd4f487e4db3e227b
 -F src/os_unix.c 50103f69121bca969761b821e2b0e393b55fe869
 -F src/os_win.c 551d973ada67127430e41d9e514e53f6beb6c5a7
++F src/os_unix.c a721d5d9002c4811c48c197cf3d38ba6a0d8f7c6
++F src/os_win.c 745cbd3ec75d67f3e0a41c01e1c1dbd45626e718
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 -F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
 +F src/pager.c 2c38bcb3117c4268a89a26a03a9abf2617002a2f
 +F src/pager.h ff4c0c4bdf5e0e1d6a6c004313e240822ceee4a1
  F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
@@@ -355,16 -353,15 +356,16 @@@ 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 427f02cf8a6e461c50f98a8663fd8f582e659456
 -F src/sqlite.h.in e877f141b15ef68ef28f84714e69d7234f9a071e
++F src/sqlite.h.in 9bf07e57b44ed96ca05946599aff6d76adf9d481
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h d671225a90ee6543ae30ec9d8ae6a8c5d9eebfbc
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
 -F src/sqliteInt.h 4eb80a9b9a512180a9739f99d754915e03d8091a
+ F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
++F src/sqliteInt.h ac21545eed0dc558e2856347a7b7dde8bcd2cc36
  F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 4bf3bea9b03aeac176ac114700f35f76a1de4c8a
- F src/test1.c e17bd82e5726545601b7841c863c445dcc5a31c1
 -F src/test1.c 7187b7e924bfc97780e6fd2a40dad94a32bddca0
++F src/test1.c 51262b6117900de4f5179d77c0b1f29fcaf6d05a
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -418,15 -415,15 +419,15 @@@ 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 cf7dce85ab9af5280b8a45985df2591efbfefe56
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
- F src/vdbe.c 3c7f4d447deaae0875879cb61460943011d94dfc
 -F src/vdbe.c f19741f2d8b33e8f09cd2219570b6c9ed924c3f1
++F src/vdbe.c 1cdbff441d627760c0b6ebd67bdb461ad3eeb7e8
  F src/vdbe.h 6f44193e7be52fd5f7c308175a936555b1e6b101
  F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
 -F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 +F src/vdbeapi.c 334db1c072f54fa5bb85bf552046d4397c5534f6
- F src/vdbeaux.c a930f913d40e4ca6f6caaef6a7b5906a369fa2b1
+ F src/vdbeaux.c c8dd3e4e932bede6363b380519d05c0557ad27ce
  F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
- F src/vdbemem.c 9b0cb32cc267ef026515f15a3594d5ff91fe4dfc
+ F src/vdbemem.c fe76c1f866de362d9b8332e59d74aa44f6560d69
  F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
@@@ -521,10 -518,10 +522,10 @@@ F test/btree01.test e08b3613540145b353f
  F test/btree02.test fe69453d474d8154d19b904157ff1db4812fed99
  F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
  F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 -F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 +F test/cache.test 0bc2195f4a7207108af2617ed356e77daf4412f7
  F test/cacheflush.test af25bb1509df04c1da10e38d8f322d66eceedf61
  F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738
- F test/capi3.test db0731f6e2a94f96c6d4c478fedef4e0c077026c
+ F test/capi3.test 860dafdc04f651a67781018cb1a0b179d22d7d15
  F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
  F test/capi3c.test b28ec47692f0fc50eb61b2d464d8d52e816b3732
  F test/capi3d.test 485048dc5cd07bc68011e4917ad035ad6047ab82
@@@ -633,7 -630,7 +634,7 @@@ F test/enc4.test c8f1ce3618508fd0909945
  F test/eqp.test 3fe051af50921284189d1970eb653f9fcf5117d2
  F test/errmsg.test f31592a594b44ee121371d25ddd5d63497bb3401
  F test/eval.test a64c9105d6ff163df7cf09d6ac29cdad5922078c
- F test/exclusive.test 1191e8904ca4b365ca4c67f2c879bed747ac0c3d
 -F test/exclusive.test 9a57bd66e39144b888ca75c309914fcdefb4e3f9
++F test/exclusive.test ff85192dcf5000a1b53452a89fa9c5b61b0138cf
  F test/exclusive2.test 32798111aae78a5deec980eee383213f189df308
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 8f7b27b61c2fbe5822f0a1f899c715d14e416e30
@@@ -1066,12 -1062,12 +1067,12 @@@ F test/speedtest1.c 1478cb3fb64ad30f291
  F test/spellfix.test f9c1f431e2c096c8775fec032952320c0e4700db
  F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
  F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
- F test/sqldiff1.test 8f6bc7c6a5b3585d350d779c6078869ba402f8f5
+ F test/sqldiff1.test 28cd737cf1b0078b1ec1bbf425e674c47785835e
  F test/sqllimits1.test a74ee2a3740b9f9c2437c246d8fb77354862a142
  F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
 -F test/stat.test b65bad7120c52583b8f0054d99eff80718119a77
 +F test/stat.test 688f0f9bca137ae95a6d237728064a7b7e31fded
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 64844332db69cf1a735fcb3e11548557fc95392f
 +F test/stmt.test fc832e52bd1273144abbb27c07fc01d1acdd9939
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -1087,10 -1083,10 +1088,10 @@@ F test/table.test b708f3e5fa2542fa51dfa
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
  F test/tclsqlite.test c6d9f546f79d15d0134c1e06583fb3ee0c3afad3
 -F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 +F test/tempdb.test be87085066978807bb9eb934ae3986521e88a675
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 8b7a789e6cd1686b0f90d9881eddc39c29006324
 -F test/tester.tcl f2b99e912d4da1e5755969b8614febd883885c8b
++F test/tester.tcl 4b09369e559630d71cff6a1d7b7099a00e447f95
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1461,7 -1457,8 +1462,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 cb0ffe844c9c3e84cba8c4df90d4d0f2e9f61586 88439a866b3b16ad7c308ebe59198662a05e7eeb
- R dd08a4ca8eff82e32a28be97b544c73d
 -P d6e2637df16764aa9723a30ea2eb8a631d28cb2b b4a1114f730c62e93623f889bc0e4fd8d0b31efa
 -R 6870e1f7d1e452978a882de2dd2b0506
 -T +closed b4a1114f730c62e93623f889bc0e4fd8d0b31efa
++P c73b5b9ccf3dcf48f403c866423bebbdc45d2b28 4bd12b57ea177cfb1f44d54bfa7aedfb8a8c0c64
++R bd073a087bdef64b2c74e895089bfab0
  U drh
- Z e3547d9db7e3a345c6613e4886d1c876
 -Z c933d47fc520e2ff9b51b35972ce646c
++Z 07b1c17c1351686cd131d8af15c82d0d

diff --cc manifest.uuid
index 1a4a94eb332280109653ffde11b0f9dc00bc3dc2,f6b0ceae980fe3f17a2dcb5fdceac5b3c113d7c6..61d34a3a18e413cf5aeb615186f6477811687f2a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c73b5b9ccf3dcf48f403c866423bebbdc45d2b28
 -4bd12b57ea177cfb1f44d54bfa7aedfb8a8c0c64
++063f1b3705625b2f115af8e909d86705b892b529

diff --cc src/main.c
Simple merge

diff --cc src/os.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/exclusive.test
Simple merge

diff --cc test/tester.tcl
Simple merge