Merge all recent trunk enhancements into the apple-osx branch.

FossilOrigin-Name: fef8430f1284b08b1c2af3d5639037478c58fb7e

diff --cc manifest
index b29a93a198c1bc1970281e674715bf2f7b43c419,ce0614fbee700d9d41c216fa452eb80dce47c233..1e7efa2a878601f6585c9633d1ce60f91ffade44
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\slatest\senhancements,\sincluding\sthe\sSQLITE_ENABLE_API_ARMOR\spatch,\nfrom\strunk.
- D 2014-10-27T18:42:03.141
 -C Change\sthe\scommand-line\sshell\sman-page\sto\suse\sthe\s".tr"\stroff\sdirective\ninstead\sof\s".cc"\sfor\sescaping\sthe\sinitial\s"."\scharacters\sin\sthe\s".help"\noutput.
 -D 2014-10-31T14:46:51.896
++C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2014-10-31T15:20:47.003
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 +F Makefile.in bf041d20aeed250922fb1ba4bd13d34d3fa470e9
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
@@@ -175,7 -172,7 +175,7 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 7f841396adfd47507ff670a471162d2bfcda3136
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c ef97f308df353d09545fc39f0d89b25afd0a5cda
 -F src/btree.c 61d96c2edacc5267fae6e477c24c774cd540d7f0
++F src/btree.c eeebb8175df346b720bc68f7fbb528d5fcfdccfd
  F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
  F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
  F src/build.c 67bb05b1077e0cdaccb2e36bfcbe7a5df9ed31e8
@@@ -224,19 -221,18 +224,19 @@@ F src/parse.y 5dfead8aed90cb0c7c1115898
  F src/pcache.c 4121a0571c18581ee9f82f086d5e2030051ebd6a
  F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
  F src/pcache1.c e412cb585f777c840ddce0500eddc5c6043c2bb5
 -F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f
 -F src/prepare.c b7b7bf020bd4c962f7c8aed5a3c542c7dfe9f9c7
 +F src/pragma.c c63b5aa7b655801cf74b7f94fdb136f4d9626522
 +F src/prepare.c 307a3ddc2f087df85114c5e4bfcc4a55c9970cde
- F src/printf.c c31012ac23e458081df4a32634b60424e0cdfaf3
- F src/random.c b8a058131851de1a37801b5587845ee73411c064
+ F src/printf.c 10a2493593c8e4a538915cd3674bd7a67f70c488
+ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 4965007d6497b6a4d7a6d98751cc39712885f952
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c 428165951748151e87a15295b7357221433e311b
 +F src/select.c 00edeea62174d9fc5e010e0044f2af64233cf602
  F src/shell.c 282f8f5278e0c78eb442217531172ec9e1538796
- F src/sqlite.h.in b03be63c5f671cfbdbeaf3197a9837b426053973
 -F src/sqlite.h.in 737b7dd0f3f81fe183646d22828b39f85ef3e68c
++F src/sqlite.h.in bcddafefaea18c0af74df5f2b1c4067c4c7013e6
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 327b70f8182a53dc2d2cf03db449bace326fe84f
 -F src/sqliteInt.h 4f86ac648ea398c1bb3db036062934cde257ea23
++F src/sqliteInt.h b156fa7ce542e3d54951b92d77052c3aa9d80b03
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
@@@ -293,22 -289,22 +293,22 @@@ F src/update.c 3c4ecc282accf12d39edb8d5
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
  F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
- F src/vdbe.c 678170cc7e8217b1926ead14108bc7d87202b3d9
 -F src/vdbe.c 49e659bc165e99b28492004b440e22146dc898ab
++F src/vdbe.c d9245b3b5b1f4dc80d3979a58f6d4d9508604163
  F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
- F src/vdbeInt.h e2a060a55ee18a6ab973353a5e2ec7ee569bf787
+ F src/vdbeInt.h acc36ac461f973f46ac7942f86abdd93d2f8cfbc
 -F src/vdbeapi.c 02d8afcff710eb35e3d9e49cb677308296b00009
 -F src/vdbeaux.c 3d6b2b412ef2193aa4729922dfc5df1efadbf6df
 +F src/vdbeapi.c 08f16b5d0d7ac370f03332161be5c27a34a195d0
- F src/vdbeaux.c df93c769d7f04d829ec247d5c054bd7d4855a8e0
++F src/vdbeaux.c 8990f551f34db71800ae0f66879ab2ec1a7afec4
  F src/vdbeblob.c 8b5442ff0954c44b45cbabbe2e94091a2e16fdef
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
  F src/vdbesort.c 975aeffa99acb0991b2f288d30294756bff41438
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 2a30791bbd7926b589401bd09c3abb33de563793
 -F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 1c4bcbbe80d5714e4ae349b9d94d05dcfb7804b7
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 4ce8c4826b7f86d080f0ed4e7a9045bb5014be77
+ F src/where.c 5665df88cbd2b38eb72b4b94c8892c8afb360181
  F src/whereInt.h 19279cd0664ce1d90b9ad3ef0108cb494acfe455
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -772,10 -769,10 +774,10 @@@ F test/pcache.test 488061b5dd685df2234d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
  F test/permutations.test cef25f5e8499a15846eccd06785f17f4180407ab
 -F test/pragma.test 19d0241a007bcdd77fc2606ec60fc60357e7fc8b
 +F test/pragma.test 5e4805a9535d46d5be677075c9663941fc40615a
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
- F test/printf2.test bed79b4c3e5da08ba88ad637c0bf62586843cfb1
+ F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a
  F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
  F test/queryonly.test 5f653159e0f552f0552d43259890c1089391dcca
@@@ -1212,7 -1210,7 +1215,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P aa7bbed10b63078dcd3468b7b47c30044bc8586d ffb9d8144bbc35bf3d929e0e13a663668fff0558
- R e56599e5c5a46d09625a0813528cde99
 -P a07078b60007e88adea67bec5f0caf91f707ad78
 -R f904ce78baced6aeb6bcb91c631714db
++P 10aaf3b148404df7912d9604ccb6921173e7ac80 67f0d469da28c023200239a1f3d0c6cef9ef0e45
++R d75441d29aa3f6ecbfd2cd8a5bc75226
  U drh
- Z c433a369e302775250ebbecbc499fc64
 -Z c463256d5d45e3bce4a212ca4dd9f3e4
++Z 6cec1210c9b1edbcdcdcba90a9e22572

diff --cc manifest.uuid
index e36c8bc79941edb5937cd9b19e9f4fd5a91d6628,4735237141e4b3b2c7251db22332af7dedadb938..91f2eec2d8180692b9ba19a7ce9510af91563085
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 10aaf3b148404df7912d9604ccb6921173e7ac80
 -67f0d469da28c023200239a1f3d0c6cef9ef0e45
++fef8430f1284b08b1c2af3d5639037478c58fb7e

diff --cc src/btree.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