Merge in latest trunk changes.

FossilOrigin-Name: bc9b9cd0589c4a51ece2e4657d622a04fc203315

diff --cc manifest
index 223d5530f132930f4d2ba9e9f8e0ca9a907e0d3c,26d0c4d7e669f061e001508cb3bcb93099953ce4..82abb063a9784b106663e5c65a7b27d50a6722ae
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2012-08-25T01:38:39.061
 -C Changes\sfor\sERROR_PATH_NOT_FOUND\sin\saddition\sto\sERROR_FILE_NOT_FOUND\sin\s\nwinAccess().
 -D 2012-08-31T12:31:18.969
++C Merge\sin\slatest\strunk\schanges.
++D 2012-08-31T14:10:24.896
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 +F Makefile.in c2d205d441ae3b96b2df35a2bd3e3dcef697b55a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 45dd3579cae399d73e3f5eab36f6f332783072e5
+ F Makefile.msc f00ec5dc2e78eb63d32c3125ab7a999aa7fcf924
  F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@@ -126,10 -123,10 +126,10 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
  F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 31cf99fcac5cd4855dd5c5377b07936abdeac34d
 -F src/btree.c 9cf6de113d23d47967df24b8d8ce6501c879d7e6
++F src/btree.c 64acbd5fd89629d2f52d5d6f851cc534d2a66fbe
  F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
  F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
- F src/build.c 196734374128023e414a818f2051d836badb3526
+ F src/build.c a3b700afd475e6387da59be6f2e86161e80d6d87
  F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 500d019da966631ad957c37705642be87524463b
@@@ -143,12 -140,12 +143,12 @@@ F src/global.c 4cfdca5cb0edd33c4d021bae
  F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 770ed633830fb49d73d90c3fdf20b703973e1e84
+ F src/insert.c b090d0a9fb9ff2dbdeaf66aedccf98cd13b1af60
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c f528c0706b009b5019002ab92043fdf83e30911e
 -F src/main.c 02255cf1da50956c5427c469abddb15bccc4ba09
++F src/main.c f076eae7069da190d22175b8cf0823a6500e49d5
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -162,13 -159,13 +162,13 @@@ F src/mutex_noop.c 7682796b7d8d39bf1c13
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
  F src/mutex_w32.c 32a9b3841e2d757355f0012b860b1bc5e01eafa0
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 -F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 +F src/os.c 4c8c8d72a6c58ad2fde4865783e8ae26b494a85e
  F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
- F src/os_unix.c 7f7816723a1cf08c6fb816c7a05665682c30c79e
- F src/os_win.c 6897cd3945f316e016a955c08bdc466b2f60fd3a
- F src/pager.c ca8424ef9b807ab86381c5b0450ce4752670e16e
 -F src/os_unix.c 69b2fe66316524eebf5f1ce85c1fdfe2952307e9
 -F src/os_win.c 5dec8fe85ee547152075c020db72aec4382f0d0a
 -F src/pager.c 5665fa9ecec51f11dabdfd8eefefa89391856007
 -F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
++F src/os_unix.c 0482b132e8f1617276661276dd49e6b0ebe1db49
++F src/os_win.c 4ee163bab365408d971045dd71dd0c05491b70c7
++F src/pager.c 85fec76b7eabbef19d86cb825e1343751d40aa4e
 +F src/pager.h 491e782fbefc83e115f85588987ebb7d00d9fde6
  F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
@@@ -178,21 -175,20 +178,21 @@@ F src/prepare.c 5e2babd80c5771354ffc1ed
  F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32
- F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
- F src/select.c 98102767fb76d90dc3071be091751ee046d59792
- F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
- F src/sqlite.h.in e17c8cae7cde16c72e9c20bc01e960245e24af0e
+ F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 -F src/select.c f843c872a97baa1594c2cc3d4c003409a7bd03af
++F src/select.c c5dbb1351a82419fd3b92806a38d1f534e5911a4
+ F src/shell.c 87953c5d9c73d9494db97d1607e2e2280418f261
 -F src/sqlite.h.in c447d35212736c4c77d86bc2d00f6cf4d4c12131
++F src/sqlite.h.in 9e7a9011bbb825777382ea8d740c942a9a382e1b
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h a6ca480c349a39569d44e4bf9c98b45afd6437c9
 -F src/sqliteInt.h 053e03a532beb909ead2df0721db67cdb4c48ae8
++F src/sqliteInt.h 0cd30dc6f6a44dc309c5754770cdcfa5e52f110a
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c fe5406573e1527957e00dcaf51edd9d8bd31b918
 -F src/test1.c 3d70f7c5987f186884cfebbfa7151a7d3d67d86e
 +F src/test1.c 23fdc06ec3bd0809eafb7168ceb165e3b8a50b8a
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
- F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
+ F src/test4.c bf9fa9bece01de08e6f5e02314e4af5c13590dfa
  F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
  F src/test6.c 417e1e214734393c24a8ee80b41485a9c4169123
  F src/test7.c 2e0781754905c8adc3268d8f0967e7633af58843
@@@ -222,12 -218,12 +222,12 @@@ F src/test_osinst.c 90a845c8183013d80ec
  F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
  F src/test_quota.c 8ab295092c70903ca6f3209fa4c75f5cb6c1bf8e
  F src/test_quota.h 8761e463b25e75ebc078bd67d70e39b9c817a0cb
 -F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
 +F src/test_rtree.c a1bbfc30f14d2bad2f93dbea7dcc697c97a40c66
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
- F src/test_spellfix.c fa83c9b4c4bdd1d41be4ad1e9241bf5a4fc9190f
+ F src/test_spellfix.c 0a5b5b27fc48b00f9e6fd6700f9535de538a964f
  F src/test_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935
 -F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 +F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8
  F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c e286f2173563f2a1747c24bcda6b9d030bf4f4e4
@@@ -241,21 -237,21 +241,21 @@@ F src/update.c 28d2d098b43a2c70dae39989
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
  F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd
- F src/vdbe.c 18781e846c0fc14a6bccf3dccc4d9e78ad7d4846
 -F src/vdbe.c 9c524bded348fd0a53adc19f2d7cad76ba3442b2
++F src/vdbe.c 7eee10a773f18fb636c33bd62220e6e8ff97fbd0
  F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
  F src/vdbeInt.h 986b6b11a13c517337355009e5438703ba5b0a40
 -F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 -F src/vdbeaux.c 9c293fd3040211687e83d5d27bef2382933146c2
 +F src/vdbeapi.c 31936c1666c789cc8eac1872f681ad38867e8c47
- F src/vdbeaux.c 5c738e03c2aab3cf98d3a753603320c36975d9e9
++F src/vdbeaux.c a3423091cf6a3fdf4e67a5a211070ef9728e7880
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b
 -F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
 +F src/vdbetrace.c 36c1ae141327a5352e5656fd448194b6927bc763
- F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
- F src/wal.c c981d242bbb28ae3fc4889528a5621cc564d3ed2
+ F src/vtab.c d2c54fd22aa83eb34fc6f7cd9b097f2fc2b1e9de
 -F src/wal.c 5acb3e7bbd31f10ba39acad9ce6b399055337a9d
 -F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
++F src/wal.c 61b556fa9ddf1f6d60244ead41f9a17aeb1e0f12
 +F src/wal.h ce626f1f9000caf09a99a6634a8d794686f92e1b
  F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
- F src/where.c 9a28820fb0ead5674d5b45dfdb32aef913fe40c3
+ F src/where.c 22783f4275f6fc09b663115a6091837cb5c510e0
 -F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 +F test/8_3_names.test 0ed0f6711fefac33829ef9f1d6ca3c56c48ef1c7
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 0be144b453e0622a085fae8665c32f5676708e00
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -560,9 -556,9 +560,9 @@@ F test/join3.test 6f0c774ff1ba0489e6c88
  F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
  F test/join5.test 86675fc2919269aa923c84dd00ee4249b97990fe
  F test/join6.test cfe6503791ceb0cbb509966740286ec423cbf10b
- F test/journal1.test 8b71ef1ed5798bdc0e6eb616d8694e2c2c188d4d
+ F test/journal1.test 69abc726c51b4a0409189f9a85191205297c0577
  F test/journal2.test ae06f566c28552c313ded3fee79a6c69e6d049b1
 -F test/journal3.test ff8af941f9e06161d3db1b46bb9f965ff0e7f307
 +F test/journal3.test ef775301aa8c64c80efa859e6aa0207add921a93
  F test/jrnlmode.test 9ee3a78f53d52cca737db69293d15dc41c0cbd36
  F test/jrnlmode2.test 81610545a4e6ed239ea8fa661891893385e23a1d
  F test/jrnlmode3.test 556b447a05be0e0963f4311e95ab1632b11c9eaa
@@@ -646,10 -641,10 +646,10 @@@ F test/pagerfault2.test 1f79ea40d1133b2
  F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
  F test/pageropt.test 9191867ed19a2b3db6c42d1b36b6fbc657cd1ab0
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
 -F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
 +F test/pcache.test fa8a2b0677225765eced806d9d1676b78a9e2c40
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/permutations.test d12fabf8abdb71b79eb6c3ef3be5e875fe790071
+ F test/permutations.test 1a8ac849b659445a0b3883caf42fa2c2a289f4a1
 -F test/pragma.test a62f73293b0f0d79b0c87f8dd32d46fe53b0bd17
 +F test/pragma.test eaf172eb376b20b9d6c639e03903dd43e476f0b8
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -933,30 -928,30 +933,30 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 82f463886e18d7f8395a4b6167c91815efe54839
 -F test/wal.test a040047d7f2b9f34bc4d597964e5e7c09609c635
 -F test/wal2.test d4b470f13c87f6d8268b004380afa04c3c67cb90
 -F test/wal3.test b22eb662bcbc148c5f6d956eaf94b047f7afe9c0
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test f58ed4b8b542f71c7441da12fbd769d99b362437
 -F test/wal6.test 2e3bc767d9c2ce35c47106148d43fcbd072a93b3
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 5ab217d21f7e5e86af2933a4ffd0d8357cc2c0bd
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 -F test/walcksum.test f5447800a157c9e2234fbb8e80243f0813941bde
 -F test/walcrash.test 4457436593be8c136f9148487c7dccd5e9013af2
 -F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142
 -F test/walcrash3.test 595e44c6197f0d0aa509fc135be2fd0209d11a2c
 -F test/walfault.test 97394d8de82a99f7abf1c12ed229640607fd0ad2
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test a31deb621033442a76c3a61e44929250d06f81b1
 -F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/wal.test 5759631b0e610d616c33cc21124b3395f39cd0c7
- F test/wal2.test 583ce66003086387a7301c0b62e549026f2a50ed
++F test/wal2.test b715008438d7332d8c3d9f8dbead2a455d847ba8
 +F test/wal3.test de822707fbc8e9d056edc895adfb8abcccee4590
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 187ae92cc9ba1ec6803681b9025cad89af1a8c69
 +F test/wal6.test c561d1e44c89f9cb458a7b03003ed4baac08ba07
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test a0b7dee73fc3d3bbf167e04533d37df379a0b7d1
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
 +F test/walcksum.test 6510e82303f6fffc2c55bb77a7774cd0eed21a6e
 +F test/walcrash.test a8fa8d8a9a50a49b7abaf8a4a7e2c7ea352c49be
 +F test/walcrash2.test c032d0040374ae28b41f99fc0cc290b4e2e34f17
 +F test/walcrash3.test 97e775404f4c76e5c46f71fbd09691c7e9c25c68
 +F test/walfault.test e5309befcaf4ab08151c35dba20cc5b8a5846748
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 3ce5c1d16a3d8c6b2f7504d44d1ebf1098efaa64
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test 4c9f69987ed2aa0173fa930f2b41ab9879478cd8
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
  F test/where3.test 667e75642102c97a00bf9b23d3cb267db321d006
@@@ -1018,7 -1013,7 +1018,7 @@@ F tool/vdbe-compress.tcl d70ea6d8a19e35
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P 65035912264e3acbced5a3e16793327f0a2f17bb 62678be3df35cdcb09172ba8c860f7b73517f1ea
- R b7154cfc03245665be15aa1058bdd068
 -P d3cf6832a59fe4c5723761abb4c89614406b03db
 -R 3b56b1cf438f03ed04a187d25a245ed3
--U drh
- Z 599d4bbcc43dc383fa81ddbf81d82915
 -Z 950f4ab8e7c8c7fcad5f5a96fb146fb0
++P 6723add4f492c30b20db8de6ed818c191dedea40 527340abff18aedbcb0f82ac1296a9f548e24ac4
++R 7369178c8728e0979a1ee39f06e2a357
++U dan
++Z 31eeb9d2487a10e71a72223ef69ba91e

diff --cc manifest.uuid
index 5ac1012068dd26a94195a50aa613f2e92e1337a1,526f75c90ce2acd644236758c5a942b2cf5a9550..f4cffbfbe8e75f97c9a6857053eb4bf1c13b8f7d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6723add4f492c30b20db8de6ed818c191dedea40
 -527340abff18aedbcb0f82ac1296a9f548e24ac4
++bc9b9cd0589c4a51ece2e4657d622a04fc203315

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
index 1f7b7c9c5d1cbeb44ed9b484bf08108332e2e89e,16294a619977abac0edd5dd980716eb756526f4b..71ac98b65d9a917112972da2cc7517e6de306591
--- 1/src/main.c
--- 2/src/main.c
+++ b/src/main.c
@@@ -2222,57 -2177,6 +2222,57 @@@ int sqlite3ParseUri
    return rc;
  }
  
-       if( isatty(STDERR_FILENO) ){
 +#if defined(SQLITE_ENABLE_AUTO_PROFILE)
 +#define SQLITE_AUTOLOGGING_STDERR 1
 +#define SQLITE_AUTOLOGGING_SYSLOG 2
 +static void enableAutoLogging(
 +  sqlite3 *db
 +){
 +  char *envprofile = getenv("SQLITE_AUTO_PROFILE");
 +  
 +  if( envprofile!=NULL ){
 +    int where = 0;
 +    if( !strncasecmp("1", envprofile, 1) ){
-       if( isatty(STDERR_FILENO) ){
++      if( isatty(2) ){
 +        where = SQLITE_AUTOLOGGING_STDERR;
 +      }else{
 +        where = SQLITE_AUTOLOGGING_SYSLOG;
 +      }
 +    } else if( !strncasecmp("stderr", envprofile, 6) ){
 +      where = SQLITE_AUTOLOGGING_STDERR;
 +    } else if( !strncasecmp("syslog", envprofile, 6) ){
 +      where = SQLITE_AUTOLOGGING_SYSLOG;
 +    }
 +    if( where==SQLITE_AUTOLOGGING_STDERR ){
 +      sqlite3_profile(db, _sqlite_auto_profile, db);
 +    }else if( where==SQLITE_AUTOLOGGING_SYSLOG ){
 +      _open_asl_log();
 +      sqlite3_profile(db, _sqlite_auto_profile_syslog, db);
 +    }
 +  }
 +  char *envtrace = getenv("SQLITE_AUTO_TRACE");
 +  if( envtrace!=NULL ){
 +    int where = 0;
 +    if( !strncasecmp("1", envtrace, 1) ){
++      if( isatty(2) ){
 +        where = SQLITE_AUTOLOGGING_STDERR;
 +      }else{
 +        where = SQLITE_AUTOLOGGING_SYSLOG;
 +      }
 +    } else if( !strncasecmp("stderr", envtrace, 6) ){
 +      where = SQLITE_AUTOLOGGING_STDERR;
 +    } else if( !strncasecmp("syslog", envtrace, 6) ){
 +      where = SQLITE_AUTOLOGGING_SYSLOG;
 +    }
 +    if( where==SQLITE_AUTOLOGGING_STDERR ){
 +      sqlite3_trace(db, _sqlite_auto_trace, db);
 +    }else if( where==SQLITE_AUTOLOGGING_SYSLOG ){
 +      _open_asl_log();
 +      sqlite3_trace(db, _sqlite_auto_trace_syslog, db);
 +    }
 +  }
 +}
 +#endif
  
  /*
  ** This routine does the work of opening a database on behalf of

diff --cc src/os_unix.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pager.c
Simple merge

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

diff --cc src/wal.c
Simple merge

diff --cc test/wal2.test
Simple merge