Merge recent trunk changes into the apple-osx branch.

FossilOrigin-Name: 3810dc62d2739cfd4f0dae7cea6af481cc698a0b

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 5b437e88c15d00ce733d5342cecb3834b22f1394,c9c66de972c22693a9b618eedcf7b6383473fb60..0d3ed281952430c9b027f49db9c0fe72f42dd9d0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2014-06-30T19:57:04.276
 -C Add\sthe\sreadfile(FILENAME)\sand\swritefile(FILENAME,CONTENT)\sSQL\sfunctions\sto\nthe\scommand-line\sshell.
 -D 2014-07-24T12:39:59.049
++C Merge\srecent\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2014-07-24T16:43:42.826
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5f7edcf144aa5c76391cfbbfd8920ad3550191c6
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
++F Makefile.in c1a047f376270fb6f201ca44640b43e690bc3db0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc ad60c4d8be35f98fdcca614088b84a91612b2b4c
+ F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -149,7 -146,7 +149,7 @@@ F ext/sqlrr/sqlrr.h 09e4f8929ad9bc26387
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 3d2a20e762126e4f0922c15ae8cc8690996f0c03
 -F main.mk 036a65c9042b2f5013baf85c82629d700fe031c4
++F main.mk 2a0146389fdfdfe73f9119828519d6009e7ca25d
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -170,29 -167,29 +170,29 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 -F src/btree.c 70c60a3807b2072982f184d9614e020d2953f89c
 +F src/btree.c c25678d7908d02edb1e9f7fdf9c6c8ce58f384e6
  F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
- F src/build.c 927e39b6aaf872c7b28f154f6acfeb9a05a72442
+ F src/build.c 48f400fa14fd6add244b954ce7e223ce7ccacf0b
  F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
  F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
- F src/expr.c 40d06d1543b1355aa02efa9666178f7642a96ed6
+ F src/expr.c b989d07fc7c8780fff77365a4fc59881223e340c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
 -F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
 +F src/func.c fe7c04fe38ba36c83dea19f4a6d9b2697ad12637
  F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c a038daeadfb818aaadafa854f40f5623b6929d84
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 +F src/legacy.c 17887cec559966b62ab3673a02c427338483b147
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c 7f7d3acc1e1a9803f85f4720fc06f327a6ebf1b1
 -F src/main.c cfdb2aa5d248ff1af60227cc3f6d485ba86f92dc
++F src/main.c 030c0fde8b64c840d9a7a93a0ef46c6f618fbb3c
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -219,19 -216,18 +219,19 @@@ F src/parse.y 22d6a074e5f5a7258947a1dc5
  F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
- F src/pragma.c 039578fb7d7cad90a5a2269651ad3b1ad98451cc
 -F src/pragma.c e17c5ea1cb9eb9d93c41bbb7c3a17e747d5e0335
 -F src/prepare.c 677521ab7132615a8a26107a1d1c3132f44ae337
++F src/pragma.c 4cb718db62a35fc536bd3851682509c2588b2c0d
 +F src/prepare.c 954f80160f120ca715ffa5db5549c3262abb335e
  F src/printf.c af06f66927919730f03479fed6ae9854f73419f4
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
 +F src/select.c a34db38f97bd8fe768d0bd9315397457c98be185
- F src/shell.c 56de2dfa3f25def4bf03098f7e2256fbb42f6e3c
- F src/sqlite.h.in 69c7d92c615945a7053cb899c6ae6a6a0fc36cca
+ F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
 -F src/sqlite.h.in ac4451c9da2771d2f4d702ef89722407242906d9
++F src/sqlite.h.in bf9910ebabd772b62ed72c40121463d3589bd4ce
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h d8e721af078ab712d920823b5bac9ffea62481c7
 -F src/sqliteInt.h 152134c6223369e2e1acb7b9cc2c0db052dae28a
++F src/sqliteInt.h ea8283fbff6f3dca461f9e857ecae4a5d968ffb9
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -247,9 -243,9 +247,9 @@@ F src/test8.c 54ccd7b1df5062f0ecbf50a8f
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
 -F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
 +F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 15c77838d6646644362c8ec13348f9889d6e37b0
 -F src/test_config.c 42fb068a038c8684741522f551325228b1389e63
++F src/test_config.c 581fcfe3069a9eb43ab6b40a279779eea5a8df50
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -285,24 -281,24 +285,24 @@@ F src/tokenize.c ae45399d6252b4d736af43
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
  F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
- F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
+ F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 9156499280d12b1afec8c59ef05ace8593295639
 -F src/vdbe.c fa74c6563486022920db4d73897bd9b837c7441d
++F src/vdbe.c 2e38a1a2a02d20e461c8f1945d5021e445f42624
  F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
- F src/vdbeInt.h 5df5e9afe9b7839cd17256220fc4f7af84b8b1cd
- F src/vdbeapi.c 32a443608642a93b77ca4b13e42e2a4d7b0fc123
- F src/vdbeaux.c f587cb9d1a20ddbd678723f0e386d4b18d6e22af
+ F src/vdbeInt.h f41a7cf5a40e7abd994d5fe3a04589ae3e1154e7
 -F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
 -F src/vdbeaux.c 1ffe0bbc3a2c8aedd95622de9be6b6d07b3d3c6b
++F src/vdbeapi.c 4606079c86aa9732b89b0ab6e16b6b776474a1cd
++F src/vdbeaux.c 43041ad3a91b0f213269b6dbda2ec8e963e6ad48
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
  F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 -F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 785b8a1fdd5600f2265b57691708329cae9acbad
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c 6ff6f7e3b272fad66eea601af489777adea3cc1f
+ F src/where.c 9454af8e5e18d6e91e5169eadfb61878e2cb42b1
  F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -827,10 -824,10 +829,10 @@@ F test/shell1.test d60946b5fde4d85fe06d
  F test/shell2.test c57da3a381c099b02c813ba156298d5c2f5c93a3
  F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
  F test/shell4.test 8a9c08976291e6c6c808b4d718f4a8b299f339f5
- F test/shell5.test ef0c52952a4a96dc1d9ec3b1fa81ec897ca48154
+ F test/shell5.test 15a419cc1df21c892ed64f5596ae7a501f2816f2
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 -F test/shrink.test 8c70f62b6e8eb4d54533de6d65bd06b1b9a17868
 +F test/shrink.test 41ab166b276af4812bcaf6f1b99c53fab4e706d0
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
  F test/skipscan1.test 28c7faa41a0d7265040ecb0a0abd90c0904270b2
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
@@@ -1074,34 -1071,34 +1076,34 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
 -F test/wal.test 885f32b2b390b30b4aa3dbb0e568f8f78d40f5cc
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test b22eb662bcbc148c5f6d956eaf94b047f7afe9c0
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 8f888b50f66b78821e61ed0e233ded5de378224b
 -F test/wal6.test 527581f5527bf9c24394991e2be83000aace5f9e
 +F test/wal.test 0ae504805b7e41b64a55fb5b7745de5ca2a0db2a
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
 +F test/wal3.test de822707fbc8e9d056edc895adfb8abcccee4590
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test da70332902b19fea23b74c657a941a180e1cb777
 +F test/wal6.test 54ac71d59046014c70ad78957139984c5bfb7eb2
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test c35dd183708148120928dca908641c361f58062c
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 -F test/walcksum.test 9afeb96240296c08c72fc524d199c912cfe34daa
 -F test/walcrash.test 451d79e528add5c42764cea74aa2750754171b25
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
 +F test/walcksum.test 932d12a2a36fb2765560d35e7eaa1e5f0b198385
 +F test/walcrash.test 011e05e9170da888851cb9ec4276bb1894ad32e3
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test 28b64e93428961b07b0d486778d63fd672948f6b
- F test/where2.test 455a2eb2666e66c1e84e2cb5815173a85e6237db
+ F test/where2.test 23fdb5d8e756554aad4ca7ae03de9dd8367a2c6e
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
  F test/where4.test d8420ceeb8323a41ceff1f1841fc528e824e1ecf
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
@@@ -1187,7 -1184,7 +1189,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 2dbdfa51703bade30b66730191e4fb286edc500b f925e9baafea625f63105f8013abb3807b418379
- R f06a12db9c201ac4c82078210e92693a
 -P f8f79f28785db716b10c3bc9d6652b98253fd125
 -R 3cb7c1591be4171f813333f040f9142c
++P f426876fe1cc9ebcda5a52f823f417a4db358517 fb1048cb2b613a0dbfe625a5df05e9dcd736a433
++R 3061a8cabbc9a67aa7283b7adbadb520
  U drh
- Z c4e674b581a44b3ada94d9205edf2bc3
 -Z d6bf09c8f21a2381ecdf6b5a91f85057
++Z eaf450f3a6782e11dc4d79000493a69c

diff --cc manifest.uuid
index 511ad66731205acb44d11e4bda064e0168fc5aa1,c704a64b44925d6691f5df80ab4d249f103166c9..529121cc9eede20ac4c31d48244205f64689cb8a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f426876fe1cc9ebcda5a52f823f417a4db358517
 -fb1048cb2b613a0dbfe625a5df05e9dcd736a433
++3810dc62d2739cfd4f0dae7cea6af481cc698a0b

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/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge