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

FossilOrigin-Name: 23722be49ad8ff21aed49a66174626798c428811

diff --cc manifest
index f38939765d121725a1e15519a9912553c2de2d7d,6c0b7335d0238bef3e8fc8aeac338785f5ff1fce..2b8ba2e3b7d8affe5189b8c840f1a6ecca79bcc9
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\sa\smisplaced\s#endif\sand\sa\sC99-ism\sin\sthe\sunix\sVFS.
- D 2014-05-09T14:56:16.432
 -C Internally,\suse\sa\s64-bit\sintegers\sfor\ssegment\slevel\snumbers.
 -D 2014-05-17T16:56:52.166
++C Merge\sall\srecent\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2014-05-20T00:27:19.719
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 +F Makefile.in 444faa7b5c5b3189fa674ff42be94d87a37eba9d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 7e6c495d9a145054a09f518781916c7503f7a8e9
+ F Makefile.msc 52911c6bfeaf9b40f47ef4615ab66d98ab0f2b3d
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -180,17 -177,17 +180,17 @@@ F src/delete.c bcf8f72126cea80fc3d5bc54
  F src/expr.c 4f9e497c66e2f25a4d139357a778c84d5713207c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 5269ef07b100763134f71b889327c333bd0989cf
 -F src/func.c 2e16316ec3a6365a0dc3e553c586f91b20f7f6c8
 +F src/func.c 6ace0c0c0d5f0a23273a0c74b35b5f41113f09eb
- F src/global.c 1d7bb7ea8254ae6a68ed9bfaf65fcb3d1690b486
+ F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c ab34bea5af4fee9f956a0805a32463fb7f674d00
  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 b3ce9d74745c8ebd16aca28dcacbd30a080626c9
 -F src/main.c 1c164c7b742f0cd60290b34dc9086df9f939f490
++F src/main.c b53f4492ca1940aaf5ca74fbdc93ce2fbdab058c
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -202,9 -199,9 +202,9 @@@ F src/mutex.c d3b66a569368015e0fcb1ac15
  F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
  F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
- F src/mutex_w32.c ab08c0fc54b71979370ca7c8f42fc64a9f211ebb
+ F src/mutex_w32.c 9bcab6e699fdb20eae784237c36b299830fb3316
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 -F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 +F src/os.c 25df79baf4bec87f75a2c4e995d63361b66b918a
  F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
@@@ -223,19 -220,18 +223,19 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c 089c4d46f067a5cccae93524c6377f981ba99bd9
 +F src/select.c 2270f57439f69f4b2fd97452203b5da53a51d668
  F src/shell.c 2afe7a7154e97be0c74c5feacf09626bda8493be
 -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 53c0b5cd25c12a22837807373693a129d90ab98b
 -F src/sqliteInt.h 1977f44283be0d3b40da315fb4fd9e21c79fadcc
++F src/sqliteInt.h 43694557feda63c43d3ca345386ce25f377a2c79
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
 -F src/test1.c 899bddeb0c7fb2b8062de6f03af4a4e4f48f9df5
 +F src/test1.c 472c069b3e1abd30972cddee330225ff5b70ac25
- F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
+ F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
@@@ -283,13 -279,13 +283,13 @@@ F src/tokenize.c 6da2de6e12218ccb0aea51
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
  F src/update.c 5b3e74a03b3811e586b4f2b4cbd7c49f01c93115
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
- F src/util.c 2b5fb283a190aacdb286f7835a447c45b345b83c
+ F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 -F src/vdbe.c 7f359193bf2366cc914a9ece093ebf284e56acdc
 +F src/vdbe.c 0c64781331869342b7c1b2fd7140318da0d9a3a8
  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
@@@ -746,11 -743,11 +748,11 @@@ F test/pagerfault2.test caf4c7facb914fd
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
 -F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
 +F test/pcache.test 488061b5dd685df2234d690370285c9b4813377b
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
- F test/permutations.test 40add071ba71aefe1c04f5845308cf46f7de8d04
+ F test/permutations.test d8946218493c77806ec1029df473d8ed4ad9aef6
 -F test/pragma.test adb21a90875bc54a880fa939c4d7c46598905aa0
 +F test/pragma.test 8ee8929dd652a5753d9cd72dbcbcb9b152bd6fd8
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/printf2.test bed79b4c3e5da08ba88ad637c0bf62586843cfb1
@@@ -1144,10 -1141,10 +1146,10 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 1712d3d71256ca1f297046619c89e77a4d7c8f6d
 -F tool/mksqlite3c.tcl ba274df71f5e6534b0a913c7c48eabfcbd0934b6
 +F tool/mksqlite3c.tcl 071ff81a618ca48c89662c0c38284d96887d09c3
  F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
  F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1
- F tool/mkvsix.tcl 924dcdecda86969686833301c08f84cca2600d94
+ F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1174,8 -1171,8 +1176,8 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
- F tool/win/sqlite.vsix a94fb9b1b1ef06efc2898975cdfcfa9643731f5e
- P eafd8aa1862fb4bbe0d2441cbd110aba1abc772c
- R 5048a0723adffb556115dc15010c4791
+ F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 -P 9fde5b960af39b187474e5b2909ff0e56d5e0bf9 7e60347e21a7473974061965a8d1f2eadde987e2
 -R 760c47be4e4c59e75f81e88f9a3c89bc
 -U dan
 -Z a762a27782746cb8cee894bb7c1f28d3
++P c8d384d14650482ac7f311c49f8264a954b1d654 8180e320ee4090e41511836678e49a98c0b228e8
++R 73770ba5f5de8e70682d46d13606f662
 +U drh
- Z 039ea58c206e5d3d88aef40fd75f7a9b
++Z b8f9004830b8476a09b7de6c6dc2e22a

diff --cc manifest.uuid
index 47bb8472f7870a4bac4915806bb2978cd645b185,6307ea55eb5e995eacb67e5c0e4a30a0dec971b2..bcd695a1dfe465894f0ec13e004aa273f1de4e81
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c8d384d14650482ac7f311c49f8264a954b1d654
 -8180e320ee4090e41511836678e49a98c0b228e8
++23722be49ad8ff21aed49a66174626798c428811

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge