Merge latest trunk changes, including the SQLITE_IOERR_AUTH error code, with this...

FossilOrigin-Name: bc195e1cd9dc1c7b97bd05cd7d0664fbc599a890

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 43f6bbc08f4d68f7d7b0109f3f1ae8f42e0f0f26,7bc59a3525dff5364c0f2e9f712e556693cd7ac9..3b6da548b6a9601a25f8cff8a5733cff344fe5f0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,8 +1,8 @@@
- C Merge\sthe\s3.9.1\schanges.
- D 2015-10-16T20:52:35.547
- F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 0f9801da22670ba81bd7b6a17a0db2ea52650841
- F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 0ed934b4ae6a5ec0b9d7e770104864f8372414ab
- F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 -C Add\snew\sextended\serror\scode\sSQLITE_IOERR_AUTH.
 -D 2015-10-26T20:39:56.458
 -F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
++C Merge\slatest\strunk\schanges,\sincluding\sthe\sSQLITE_IOERR_AUTH\serror\scode,\swith\sthis\sbranch.
++D 2015-10-26T20:50:15.196
++F Makefile.in 92b9226e3675a398c7f13e67463961f31cb28ef3
+ F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
+ F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION a47917b59f38b632b3a8662d14fd20f94956bdd0
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -233,10 -230,10 +230,10 @@@ F ext/rbu/rbufault2.test 9a7f19edd6ea35
  F ext/rbu/rbufts.test 828cd689da825f0a7b7c53ffc1f6f7fdb6fa5bda
  F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48
  F ext/rbu/sqlite3rbu.c ea47de615e911b3a69a8e7fb3be3866298403a25
- F ext/rbu/sqlite3rbu.h 1d568cb33738d7900975cc5c72e6f68049f15914
- F ext/rbu/test_rbu.c 2a3652241fa45d5eaa141775e4ae68c1d3582c03
+ F ext/rbu/sqlite3rbu.h 0bdeb3be211aaba7d85445fa36f4701a25a3dbde
+ F ext/rbu/test_rbu.c 4a4cdcef4ef9379fc2a21f008805c80b27bcf573
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 -F ext/rtree/rtree.c 0f9b595bd0debcbedf1d7a63d0e0678d619e6c9c
 +F ext/rtree/rtree.c 65a024af764c4ee608f039ee67e5bf009327b7bd
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 96a80c08440c932cd72aac50660e7af2612d2cda
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -267,9 -261,7 +264,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 1fdae452c5881b5eabab470acf91e013269fbd93
- F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
- F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
 -F main.mk 47b879ad92fe896895dcfc1bbec5c119ee2aa690
++F main.mk c7f84d8f3ea251491fb5d6a5774c659c3ec0c322
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -288,8 -280,8 +283,8 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 7893a74448bcac7e3ea1e2308dd38e12dd92d351
- F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
 -F src/btree.c 9d684e19f84633323de7a767da2e2b8cf51fa600
++F src/btree.c 4213df624323614dd79f1e5fda74a885b1955056
+ F src/btree.h cf936d962b3f4179948d53ea58f3580de9b2ed0c
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
  F src/build.c d6162335d690396dfc5c4bd59e8b2b0c14ba6285
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
@@@ -306,18 -298,18 +301,18 @@@ F src/global.c 508e4087f7b41d688e4762dc
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 3c522beb5bf50a2efee1fca1e80fd40942e5817c
+ F src/insert.c 419a947f27ce2da18eebf440a5aa80cc825defae
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
- F src/loadext.c c5916a158f1fb74d955847c84f7ebdb6f5de9d8c
- F src/main.c 60b45cb19dd4e3f276d70a76a7326606e234e74d
- F src/malloc.c 3a37ce6979a40f499d8cea9e9ab4e8517854d35d
+ F src/loadext.c 18586e45a215325f15096821e9c082035d4fb810
 -F src/main.c 1cae029707c323292b5691e4d0a4c5c44561c877
++F src/main.c 458135ea966de50836ded1aac2e98ee856828bca
+ F src/malloc.c 337bbe9c7d436ef9b7d06b5dd10bbfc8f3025972
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
- F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
+ F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
- F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
- F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
+ F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
+ F src/mem5.c c1ab1153bd6443bdf6f71e4213c6fb31221b9eb7
  F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
  F src/msvc.h d9ba56c6851227ab44b3f228a35f3f5772296495
  F src/mutex.c 8e45800ee78e0cd1f1f3fe8e398853307f4a085c
@@@ -338,28 -330,27 +333,28 @@@ F src/pager.h 9c77ab70c5f0becfa3002016d
  F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
  F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
- F src/pcache1.c e822007159d53a7ea7aa040d6e28964ddb6de083
- F src/pragma.c f66e2d2d2132373af398c452aac012347fb2adfb
+ F src/pcache1.c 902e1bc7bdaa81b40f8543407c5e2ac8ef4dc035
 -F src/pragma.c 8fd4c8a12e25f0d916426f160255ebe25415eba7
++F src/pragma.c 5d97c87f05261fe3fc0fcc0be925bdbbb1b889d8
  F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
 -F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
 +F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 0bc9cd2e1cacfdc9cdc9a83884cc100f166e80a4
+ F src/select.c dbf1fb82317043304da334a33206add211487f96
  F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
- F src/sqlite.h.in 95d147c55638c7b8e9e096e27495bcef59b72668
 -F src/sqlite.h.in 070b49c253bd41607ec43505a16163aa4b537b83
++F src/sqlite.h.in 88d1a87fe01f5ba63d2efc7e3a170a9ae0a8b037
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h 530f13b432ea748dd98a3b9cae2e856918d27128
 -F src/sqliteInt.h 835fce874a55144491d441f22c21a954bd17a1f3
++F src/sqliteInt.h f97de13012ac4addbf0b11344fdb169e94ec81e8
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
- F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
+ F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
 -F src/test1.c 8fff9c5aa63d6490f516d018b70c12a9cb9a4d8a
 +F src/test1.c daa42e4366b022599eae17bf1a0125b355524189
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
- F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
+ F src/test3.c f7ae1d6a4aa07aac257de18a43800c1199b513fc
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
  F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
@@@ -410,25 -401,25 +405,25 @@@ F src/update.c 40e51cd0883cb5bfd6abb7d8
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 1f3280cf5b070c0e74a10f8acc4d9f589bead7db
 -F src/vdbe.c 3f22833a67dbee98f5b8d7acac0f5097ecc4dcb5
++F src/vdbe.c cb8eee3953698a0a0e88963c459355ab37ac7259
  F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
- F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
+ F src/vdbeInt.h 777dd76d513347acb1a71d94df2be00516add637
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c 906bc74ea90707b57a23e4264727fff7b48d0cb5
 +F src/vdbeapi.c b13f483b1375467c367de486edf2be05234e27bb
- F src/vdbeaux.c f1f5d5acac493d77c8b4240a5bc5c8b6aa7c1227
++F src/vdbeaux.c ead8cfffad5a0bde7c795a3d231109818e1e5526
  F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
- F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
- F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
+ F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
+ F src/vdbesort.c 8b23930a1289526f6d2a3a9f2e965bcc963e4a68
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 929c1d7e2da94dda41e5c2fa71a919fff91ad04b
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 4c4646675e794ac71e701289edefd7cd81bac844
+ F src/where.c 0a3badc48bb89b1d80ead96081e4a9aa85e65e95
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
- F src/wherecode.c cdfff200d065e7fb1af827b3274ed46b10a91d65
+ F src/wherecode.c b924b78acd9e623fb69bfa2cb65cd7d542166dd3
  F src/whereexpr.c e63244ca06c503e5f3c5b7f3c9aea0db826089ed
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -1395,7 -1392,7 +1397,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 1900ce011c7e0c10d670d86833ac701ecf4fa223 767c1727fec4ce11b83f25b3f1bfcfe68a2c8b02
- R 0bf5e3cfd1318620e1ed74136811fe8c
- U drh
- Z 2d5e2f5daa5600640fefdbf03922d24a
 -P de6972515f65c5cf5da7cfdf876a05718299e9b8
 -R 4eb922ad778b7d33d7840d32c90fdca7
++P dd07688d3a478bead1174cf243fd5a667ccdda8d b4e70dd08e79decaa09f7b99e2dc7e2df92f26ee
++R 2d5f7cca0dba7164de271770c573bdd7
+ U dan
 -Z 576bf69fcd2542cc0c74c72ff3821475
++Z 8244dfcc9d51d031dced1da80e878ccd

diff --cc manifest.uuid
index 6262a7a4e922c13d3bd2b637a5dfa427d20780e3,5e36aaf7a331eebe0cbd29d4253a45faa68fef6e..a9b30fd503489778640c6be8410905ed649a6e8b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dd07688d3a478bead1174cf243fd5a667ccdda8d
 -b4e70dd08e79decaa09f7b99e2dc7e2df92f26ee
++bc195e1cd9dc1c7b97bd05cd7d0664fbc599a890

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge