Merge the latest trunk enhancements into the apple-osx branch.

FossilOrigin-Name: 6fc7207727d50c3039c7a0c6c9151cad6b9d25de

diff --cc manifest
index 4529526cb81b89155a0b7abfec0aad5355720206,d52803d558e4f547324a5d046e7aa0319b187057..e345f8dd5984798a65e60277464014b1f4277a94
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sthe\slatest\senhancements\sfrom\strunk.
- D 2014-10-01T01:46:35.180
 -C Remove\san\salways-true\sbranch\sin\swhereRangeScanEst().\s\sReplace\sit\swith\san\nassert().
 -D 2014-10-08T19:33:54.518
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2014-10-09T11:27:38.356
  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,33 -172,33 +175,33 @@@ F src/auth.c d8abcde53426275dab6243b441
  F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c fe089e57e16c09b8bb8e268e32da9ddf2d0ace9c
 -F src/btree.c fa00618117fb6bb46c243452c56997c0d22d4fc9
++F src/btree.c 5c97b88747010ac1f856477d35e18e6ff357d506
  F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
  F src/btreeInt.h 1bd7957161a1346a914f1f09231610e777a8e58d
- F src/build.c bde83dd5cf812e310a7e5ad2846790a14745bef4
+ F src/build.c 9e5205db9a0c8a1a4ce7379d60a2a34cb0b7339c
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
  F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
  F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
  F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
- F src/expr.c 46a8ca93361d09f2ec6d9b7d524751510569d737
+ F src/expr.c fc204d08af06437ddaffe5a1b1f1f6f9e1a55d6d
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
 -F src/func.c ba47c1671ab3cfdafa6e9d6ee490939ea578adee
 +F src/func.c 93a4b3c54019d6dbbe49800822d802df70553980
- F src/global.c 5110fa12e09729b84eee0191c984ec4008e21937
+ F src/global.c 01c1f36ecfcf10770db648422a8852c222308bb9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c de741e66e5ddc1598d904d7289239696e40ed994
- F src/main.c 6d6c8e53be61b7921c29f6a849799e6f91fe92ab
- F src/malloc.c 5bb99ee1e08ad58e457063cf79ce521db0e24195
 -F src/main.c bbe872b0ac0007bed0ebe1936fc493b039ad4f51
++F src/main.c 8185a7af2a5cdfb7d83c4a62871c7e8e9b53477b
+ F src/malloc.c 3c3ac67969612493d435e14b6832793209afd2ec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
- F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
+ F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
  F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
@@@ -215,12 -212,12 +215,12 @@@ F src/os.c 25df79baf4bec87f75a2c4e995d6
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c fb587121840f690101336879adfa6d0b2cd0e8c7
 -F src/os_win.c 0a4042ef35f322e86fa01f6c8884c5e645b911e7
 +F src/os_unix.c 318d879a343526a955885e3a1fddfd4bcb6d9a84
 +F src/os_win.c 1f331fe64c399490a0603c64ab321ef600e57213
  F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
- F src/pager.c 69e5a3f5f5fe2c82be4e17fe6344c8cfdb314b64
 -F src/pager.c a171cf9dd09c6cb162b262c328d4dfd198e04f80
 -F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
++F src/pager.c 83e9a7af13a85244903e0c69d213b4852b7fcbb0
 +F src/pager.h 8feb18f845951ab37e1f65a319b2da24185173ac
- F src/parse.y ce1494308578d2f10a68cd8debc9fc156dda1094
+ F src/parse.y 5dfead8aed90cb0c7c1115898ee2266804daff45
  F src/pcache.c 4121a0571c18581ee9f82f086d5e2030051ebd6a
  F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
  F src/pcache1.c dab8ab930d4a73b99768d881185994f34b80ecaa
@@@ -230,18 -227,17 +230,18 @@@ F src/printf.c 6b79bbd063dcbadca4cf617a
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c f11533162b57ed5ed37f549add34cbcdf51f6712
 +F src/select.c f0ee74ce94cdd174852124e1203bf54cf0265e02
  F src/shell.c 38f627b0885191357f55902a3ac199de90d79715
- F src/sqlite.h.in 4dc670038bf2ec9d2aec4864c99322e1c976d855
 -F src/sqlite.h.in 4a5e5158c189d2bcd45c7c4607c2c0eb6d25c153
++F src/sqlite.h.in b03be63c5f671cfbdbeaf3197a9837b426053973
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 15966870ee39afddc6934336537b32f7da02f89b
 -F src/sqliteInt.h 6ac5e34a590ad7ea22af91d190bdb212b12107be
++F src/sqliteInt.h 17ad00f1c716bc4de93047dbcc978fe592c9c5ff
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
+ F src/status.c 961d5926e5a8fda611d385ec22c226b8635cd1cb
  F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
  F src/tclsqlite.c c67d310c833046cccc192125d64ad422ab882684
- F src/test1.c ba21c4d107695538c9ee78c7a1f548b460afc017
 -F src/test1.c 518db4305d76b29dd9da3f022ca899c8fcdf9fc7
++F src/test1.c 226349f42ce755148e6ba7bd74a85020a41dbd59
  F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -252,9 -248,9 +252,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 00e23428eaf3506b240e43dab98d9df9ad332452
 -F src/test_config.c a4cdebe093474c02eecc5e4008b1a22198edf975
++F src/test_config.c 42d34cb7d3218e2176a92a2fc21c929596eb6e0d
  F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -293,22 -289,22 +293,22 @@@ F src/update.c 729f6f18fc27740591d085e1
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
  F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
- F src/vdbe.c 478069124a9e617970e200d187f309a3969386ce
 -F src/vdbe.c fee8286ff026bb9cf96ce87971b60aba53863b78
++F src/vdbe.c 30f8ae7e6c94d92a7f3aaa2ec15bc6504b410993
  F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
  F src/vdbeInt.h 0b97a3190f8fbf460655985a9183019f5a702754
- F src/vdbeapi.c b7b086fc95b12b0d6694faa9150687e74158af69
 -F src/vdbeapi.c 37a6c6ae284a97bcace365f2f0a225680c0499d9
 -F src/vdbeaux.c 5b687d7b5beaaa5b97189edf25cf08c311834933
++F src/vdbeapi.c 72c51192faa562c8859bdc3223ea5e2ecab2f418
 +F src/vdbeaux.c a326631b3ec11f2285bee30a2352a8ee6dedfb19
  F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
- F src/vdbemem.c 1e105dacf5190fc85a8ec2107c0dcc1884e75099
+ F src/vdbemem.c 481327f50d9da330053aa7456702ce46d0a4e70f
  F src/vdbesort.c 5c1bacf90578d22b630fbf6ed98ccf60d83435ef
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
 -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 2f42fe0d19303e0f5ce29aff3afbd3e43cbd6efb
+ F src/where.c 6fe21e0f60a449af5d75d00e6d480370464a9a48
  F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
 -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
@@@ -478,9 -476,9 +480,9 @@@ F test/exclusive.test c0d5e3c0756ac6ccd
  F test/exclusive2.test 32798111aae78a5deec980eee383213f189df308
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 8f7b27b61c2fbe5822f0a1f899c715d14e416e30
- F test/expr.test 67c9fd6f8f829e239dc8b0f4a08a73c08b09196d
+ F test/expr.test c4b9bf0cc60b26862475e19999fbd2609ca8259c
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
 -F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
 +F test/fallocate.test fe52076a43ff99da8411990dbb4f374e81e88c85
  F test/filectrl.test 14fa712e42c4cb791e09dfd58a6a03efb47ef13a
  F test/filefmt.test cb34663f126cbc2d358af552dcaf5c72769b0146
  F test/fkey1.test e1d1fa84cde579185ea01358436839703e415a5b
@@@ -754,7 -751,8 +756,8 @@@ F test/orderby5.test 8f08a54836d21fb7c7
  F test/orderby6.test 8b38138ab0972588240b3fca0985d2e400432859
  F test/orderby7.test 3d1383d52ade5b9eb3a173b3147fdd296f0202da
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
 -F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa
+ F test/ovfl.test 4f7ca651cba5c059a12d8c67dddd49bec5747799
 +F test/pager1.test 1c39b52a036afd0813fdd47c9d2ebc83dec8fd90
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -864,9 -862,9 +867,9 @@@ F test/speed4p.explain 6b5f104ebeb34a03
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
  F test/speedtest1.c 83f6b3318f7ee60e52b978b5a5e5dd7e83dfb7ee
  F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
- F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
+ F test/sqllimits1.test 9014524e7ab16e2a4976b13397db4c29cc29c6d9
 -F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stat.test 1e5faf39649a0bb368770f780f926847520ea3f4
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
  F test/subquery.test 666fdecceac258f5fd84bed09a64e49d9f37edd9
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -1205,7 -1203,7 +1208,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 3967ebe83e7cbb1dde26e4c9a6713d5c70fefe46 5ce05757aac80b99c3b2141cd301809f8e28e661
- R 6467cd286a3fdb36be6b70fa836344c0
 -P 6483d426c4c5c772cd49412ea37e0fa7a0378904
 -R df1d18db7990f8a7d78a79273193f180
++P 2078454ac998ccb5e837c4f13d8d8b2f312f4f50 42e48fd3a6a6219d9bd6135d821b38c5157922ba
++R 2e62ccfdcd7917c19ebd0736a2399e76
  U drh
- Z 3d8992f21a949b59b0ffe1e24a37b670
 -Z 70427f180e63fb554c9a4909a2862788
++Z 6bab209fb14bdb3bb6e9da445e244059

diff --cc manifest.uuid
index e2034e59bd0ef46a76062f4a267b39cc75cebee6,ba92b776aa1f853017cf11646442475c4e40f40b..3dd5ff81ac6e018e287fd23f7290f22d549766c8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2078454ac998ccb5e837c4f13d8d8b2f312f4f50
 -42e48fd3a6a6219d9bd6135d821b38c5157922ba
++6fc7207727d50c3039c7a0c6c9151cad6b9d25de

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pager.c
Simple merge

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

diff --cc src/sqliteInt.h
index 08628772858241244ff40e46dae52f622f388e90,7998638c7fc49ada13ea9ac35c132bb22f9bf177..7dc68ef70cbba0795437fb73e15e639c75d190c4
--- 1/src/sqliteInt.h
--- 2/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -3809,35 -3800,10 +3810,34 @@@ SQLITE_EXTERN void (*sqlite3IoTrace)(co
  # define sqlite3MemdebugNoType(X,Y)   1
  #endif
  #define MEMTYPE_HEAP       0x01  /* General heap allocations */
- #define MEMTYPE_LOOKASIDE  0x02  /* Might have been lookaside memory */
+ #define MEMTYPE_LOOKASIDE  0x02  /* Heap that might have been lookaside */
  #define MEMTYPE_SCRATCH    0x04  /* Scratch allocations */
  #define MEMTYPE_PCACHE     0x08  /* Page cache allocations */
- #define MEMTYPE_DB         0x10  /* Uses sqlite3DbMalloc, not sqlite_malloc */
  
 +#if (SQLITE_ENABLE_APPLE_SPI>0) && defined(__APPLE__)
 +
 +/*
 +** An instance of the following structure is used to hold the process ID
 +** and return-by-reference lockstate value.  The SQLITE_FCNTL_LOCKSTATE_PID
 +** requires the 4th argument to sqlite3_file_control to be a pointer to an
 +** instance of LockstatePID initialized with a LockstatePID.pid value equal
 +** to a process ID to be tested, or the special value SQLITE_LOCKSTATE_ANYPID
 +** The Lockstate.state value is always set to one of the following values
 +** when sqlite3_file_control returns:
 +** 
 +**   SQLITE_LOCKSTATE_OFF    no active sqlite file locks match the specified pid
 +**   SQLITE_LOCKSTATE_ON     active sqlite file locks match the specified pid
 +**   SQLITE_LOCKSTATE_NOTADB path points to a file that is not an sqlite db file
 +**   SQLITE_LOCKSTATE_ERROR  path was not vaild or was unreadable
 +*/
 +typedef struct LockstatePID LockstatePID;
 +struct LockstatePID {
 +  pid_t pid;                 /* Process ID to test */
 +  int state;                 /* The state of the lock (return value) */
 +};
 +
 +#endif /* (SQLITE_ENABLE_APPLE_SPI>0) && defined(__APPLE__) */
 +
  /*
  ** Threading interface
  */

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge