Merge trunk changes into the apple-osx branch.

FossilOrigin-Name: b9fad4490c437a2c49cf86cc1c068433d6d2866b

diff --cc manifest
index aa49a4d0647fa919c1dc12fa0d8d4dd3983d881e,5ca3da5016047dc1c811c4e8aea35e0a5d608271..15b303b4c5abf9d04a0631c0b36e891ce189d43b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\srecent\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2014-05-26T20:08:23.818
 -C Fix\sto\sthe\sEXPLAIN\sindentation\slogic\sin\sthe\scommand-line\sshell.
 -D 2014-05-29T20:17:57.027
++C Merge\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2014-05-29T20:36:56.002
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 +F Makefile.in 444faa7b5c5b3189fa674ff42be94d87a37eba9d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 52911c6bfeaf9b40f47ef4615ab66d98ab0f2b3d
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
@@@ -168,10 -165,10 +168,10 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 9656f30cce57433bdc708d4ad91d81c64237d2c4
 -F src/btree.c 70c60a3807b2072982f184d9614e020d2953f89c
++F src/btree.c c25678d7908d02edb1e9f7fdf9c6c8ce58f384e6
  F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
- F src/build.c 92539f47043ac9c48921450a9b2162da672bda4a
+ F src/build.c 927e39b6aaf872c7b28f154f6acfeb9a05a72442
  F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
@@@ -179,18 -176,18 +179,18 @@@ F src/date.c 593c744b2623971e45affd0bde
  F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
  F src/expr.c 4f9e497c66e2f25a4d139357a778c84d5713207c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 5269ef07b100763134f71b889327c333bd0989cf
+ F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
 -F src/func.c 2e16316ec3a6365a0dc3e553c586f91b20f7f6c8
 +F src/func.c 6ace0c0c0d5f0a23273a0c74b35b5f41113f09eb
  F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c ac1a00ca5952555ad54911666762ee5d59cb63cd
+ 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 40d0837e5d0597eadc47c3acc2fc95bdbd9250b8
 +F src/main.c a0c13683598252e3d5edda0459e972cd52616b0b
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -208,11 -205,11 +208,11 @@@ F src/os.c 25df79baf4bec87f75a2c4e995d6
  F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
 -F src/os_win.c 648f842876e25391b7c454c8e49f7db1fd981d65
 +F src/os_unix.c 6a54dad9ffb25faaa81604a3eebedeb04da9b639
- F src/os_win.c 31f80c90591fdee22a76682c4b1dd5552d5a69a9
++F src/os_win.c 26d49ff484b8bd59037122151d545734b5cd3466
  F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
 -F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
 -F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 +F src/pager.c d878c40eb8c75e9ae79b00cc80ad9710679f9a31
 +F src/pager.h 8feb18f845951ab37e1f65a319b2da24185173ac
  F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
  F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
@@@ -223,13 -220,12 +223,13 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c bd4020ec258f7dcf346da550dbd08481d7fb0877
- F src/shell.c bfac06fb15f3cd0d447e2e72ab3a283fac301813
 -F src/select.c 7df17ec5506c2427576d412bee0e6ea740e12563
++F src/select.c 2e621e9aa6da9c24a06359e0ddb1b7354e47f9f7
+ F src/shell.c 33f6c0bc0e32eae099f7c2b79cfa7515b4b4702c
 -F src/sqlite.h.in 564fc23db33870b5096b20d72df7491ce0b8b74f
 +F src/sqlite.h.in 1581bfade051f90dcd28b44c6b04fbf326bec4db
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 43694557feda63c43d3ca345386ce25f377a2c79
 -F src/sqliteInt.h fccdc735c27b3dc12322fec7cdad8bc76be8d00b
++F src/sqliteInt.h 6b40bb90f547ef70d78cf43d9d1b4e5656e9eb1b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -285,22 -281,22 +285,22 @@@ F src/update.c 01564b3c430f6c7b0a35afaf
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 523587222aee9e0da91b5300143a1472e0650da2
 -F src/vdbe.c 9bfe6becfc094382ae213656fbe511055ad83a54
++F src/vdbe.c 9156499280d12b1afec8c59ef05ace8593295639
  F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
  F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
 -F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
 +F src/vdbeapi.c 32a443608642a93b77ca4b13e42e2a4d7b0fc123
 +F src/vdbeaux.c a82cfad30a3b4c1758c28dcee2b4fc20a70cd121
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
- F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
+ F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 -F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 29854e652a9d7dc0d7a87ff1a9dbffac0aaf2e16
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c 9d351a5ecefdcc104d0bb7d9b5631dce4d60757c
+ F src/where.c b3be5eb4193b6327c4a02fe91411df503fe770e8
  F src/whereInt.h 6804c2e5010378568c2bb1350477537755296a46
 -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
@@@ -818,14 -813,14 +818,14 @@@ F test/shared9.test 5f2a8f79b4d6c7d107a
  F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5
  F test/shared_err.test 0079c05c97d88cfa03989b7c20a8b266983087aa
  F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
- F test/shell1.test f2a1d471e5cd2b42f7a65b166dc1ace2b8d11583
+ F test/shell1.test fb080d67c81e8a80a79ea04b36f127209b5bd112
  F test/shell2.test c57da3a381c099b02c813ba156298d5c2f5c93a3
  F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
- F test/shell4.test aa4eef8118b412d1a01477a53426ece169ea86a9
- F test/shell5.test fa5583230c0aea5c9ff33f0ac1e26b1e3f03d153
+ F test/shell4.test 8a9c08976291e6c6c808b4d718f4a8b299f339f5
+ F test/shell5.test 6b1a53c49a4ff5c3bd0bad17a85ecba505608278
  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
@@@ -1175,9 -1171,9 +1176,9 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
+ F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 23722be49ad8ff21aed49a66174626798c428811 856d44a206d82e96265103556dedda39ca3602b1
- R 9d6d9a29c0b3c4c142dbb445d5e2c64b
 -P 48dce821a07ac29da6ce05e92cf3f6e52b6eb388
 -R f3f6ddac33e05ba165213ff981b802f2
++P 54b5fa77e9b2ae447fd25cbdb9abfe37f2226504 8f916ed1e185ac728e00624d90e1d7bd2dda4469
++R 2814407c1e56278568cb201abee6bef2
  U drh
- Z 7b09d2434e64f941ce66ead79dfbcafc
 -Z 830218d29106127a2f4cf14b2b59a5e2
++Z ff5da8f06de1c70f7fc6ed02bdf0d70d

diff --cc manifest.uuid
index 1609107d34dba608cb11310f7d67ef9ae252a171,16ffe06ff62403a6b172e6e8b5d57a54874bd896..8042d90400a5805a4dff6bf22d58b32a0d1ec2fb
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 54b5fa77e9b2ae447fd25cbdb9abfe37f2226504
 -8f916ed1e185ac728e00624d90e1d7bd2dda4469
++b9fad4490c437a2c49cf86cc1c068433d6d2866b

diff --cc src/btree.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge