Merge trunk changes into the apple-osx branch.

FossilOrigin-Name: 3896e23373d41371fc6839168a97a669106486af

diff --cc manifest
index 7cc669799322158fde18f97eb9ae17e73a05d1e2,fbd819836120133a40a54172f95dada84f98be6c..3ae8204127ae5c70c8411ea0a9bdf52a3e917e8d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Incremental\smerge\sto\sprevent\sa\shuge\spileup\sof\smerge\sconflicts\sresulting\nfrom\sediting\sthe\ssame\scode\sin\stwo\sdifferent\sbranches.
- D 2015-02-19T15:56:27.502
 -C Fix\sa\scompiler\swarning\sassociated\swith\sUSE_PREAD64.
 -D 2015-02-21T00:56:05.294
++C Merge\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2015-02-21T01:03:48.964
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
 +F Makefile.in e1f1fce0d47e29ffae67c92834d0e6e1c699743e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc fc6b0b233b5621f3e56298e4d6a0b3f6c936c520
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -171,14 -168,14 +171,14 @@@ F sqlite3.1 fc7ad8990fc8409983309bb80de
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
  F src/alter.c ba266a779bc7ce10e52e59e7d3dc79fa342e8fdb
  F src/analyze.c 91540f835163d5369ccbae78e2e6c74d0dd53c1d
- F src/attach.c 7f6b3fafa2290b407e4a94dcf1afda7ec0fe394b
+ F src/attach.c 880f9b8641a829c563e52dd13c452ce457ae4dd8
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
- F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
+ F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c 11945da2e526b6f02a7c24aaf7136adb131aefe9
- F src/btree.h 94277c1d30c0b75705974bcc8b0c05e79c03d474
- F src/btreeInt.h a3d0ae1d511365e1a2b76ad10960dbe55c286f34
 -F src/btree.c a31ac00e30fb7bb49e90e48ce29ef8a61591be96
++F src/btree.c 7f5174c0744a265f3ecd8dd8bc27f439e6de34b3
+ F src/btree.h 9cbbb92aab22ef8b50493c40aa3f8de87c43a2fb
+ F src/btreeInt.h 2bfefc01875d8da066504c233ec259fcb3b2ef72
  F src/build.c ba45ebd02904e84d98839a6ea74c3eb948596587
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
@@@ -217,11 -214,11 +217,11 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c e9666eb40f1dd211c362b08d595790acc7a02a62
 -F src/os_unix.c c06b1b263d52e14473ccc619422af6b64570a3b8
 -F src/os_win.c 8223e7db5b7c4a81d8b161098ac3959400434cdb
++F src/os_unix.c 2a05bfbc7661abf9e9d0104869d60dfa9656842a
 +F src/os_win.c 1d1ef630b3e3859b7399952909e10d3a4d43fc77
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
 -F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
 +F src/pager.c 694caffb16891a96608193968d7c9a8fa9a71240
 +F src/pager.h 5ead19acf64a16b7b663476bd36c60d26f03a696
  F src/parse.y 0f8e7d60f0ab3cb53d270adef69259ac307d83a8
  F src/pcache.c d210cf90d04365a74f85d21374dded65af67b0cb
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
@@@ -282,8 -278,8 +282,8 @@@ F src/test_rtree.c bfe6f4386517f7005431
  F src/test_schema.c 2bdba21b82f601da69793e1f1d11bf481a79b091
  F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
  F src/test_sqllog.c b690c12933f50ff46491e0d56a251f84ae16e914
- F src/test_stat.c 9898687a6c2beca733b0dd6fe19163d987826d31
+ F src/test_stat.c ffc8177f6e69de32a8a89fa6bca73facb6c5face
 -F src/test_superlock.c 06797157176eb7085027d9dd278c0d7a105e3ec9
 +F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8
  F src/test_syscall.c 2e21ca7f7dc54a028f1967b63f1e76155c356f9b
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c af391ec03d23486dffbcc250b7e58e073f172af9
@@@ -296,12 -292,12 +296,12 @@@ F src/trigger.c 25571661fdeae8c7f975ff4
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
- F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
+ F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
 -F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a
 +F src/vdbe.c 0fa93ce5135f2083abcb28e854be3b4b49477eac
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
 -F src/vdbeapi.c 3d88089b10f71750b019a806224f0277d371a072
 -F src/vdbeaux.c 97911edb61074b871ec4aa2d6bb779071643dee5
 +F src/vdbeapi.c 855e0c2f6635b185d59e4f1ee5f66e2ae98d61fb
 +F src/vdbeaux.c 7069b951a45fb7eafed15bd358ae2f35356f33ad
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
@@@ -1244,7 -1239,7 +1244,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 57d7024007c2a71bf6cb875b1f1daf26924d188e 81f242e338d6122e27aad86986bfd140012c6582
- R 788417e399f877a510499bdc109cf276
 -P 7560a9fa50236ecaa0617f1ab5bb5662f4a61c72
 -R afd779aaccfbda112c52de91ea006a71
++P 82c4c4e248bfca38bc3285d5a8414f7180c2eab5 c299e55a661c04f71ab43cb8aed04f8ece6e0567
++R e9c989f2bc42f6e5000d27318d2c6c85
  U drh
- Z 8131997588d15bedfe4c84b3279820f9
 -Z 8991d0e22753a2d2a931885c01f739fa
++Z 3c26de8e63c7af1b725fdcce7277f831

diff --cc manifest.uuid
index 891cc723564df212abb21d313c6ddd36d3fc10c1,799d2f85ad2ea52a7ed1fd66f404557a06838507..dbc12d8776745464cf89ea34c6aee5f2def277c1
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 82c4c4e248bfca38bc3285d5a8414f7180c2eab5
 -c299e55a661c04f71ab43cb8aed04f8ece6e0567
++3896e23373d41371fc6839168a97a669106486af

diff --cc src/btree.c
Simple merge

diff --cc src/os_unix.c
index 8e55f3d46edb322c94f68006eccb01473e804af6,48aac166d091af8cfaa57e5bfa3e9107d67feea9..406cfb55602ed18dc19bfbb408365a31221c2ef1
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -2163,11 -1835,7 +2162,11 @@@ static int posixUnlock(sqlite3_file *id
          lock.l_whence = SEEK_SET;
          lock.l_start = SHARED_FIRST;
          lock.l_len = SHARED_SIZE;
 -        if( unixFileLock(pFile, &lock) ){
 +        if( unixFileLock(pFile, &lock, 10) ){
-           tErrno = errno;
++          int tErrno = errno;
 +#if OSLOCKING_CHECK_BUSY_IOERR
 +          rc = sqliteErrorFromPosixError(tErrno, SQLITE_IOERR_RDLOCK);
 +#else
            /* In theory, the call to unixFileLock() cannot fail because another
            ** process is holding an incompatible lock. If it does, this 
            ** indicates that the other process is not following the locking
@@@ -8003,11 -6762,11 +8002,11 @@@ static int proxyConchLock(unixFile *pFi
          continue; 
        }
        
 -      assert( nTries==3 );
 -      if( 0==proxyBreakConchLock(pFile, myHostID) ){
 +      assert( pCtx->nFails>=3 );
 +      if( (pCtx->nFails==3)&&(0==proxyBreakConchLock(pFile, myHostID)) ){
          rc = SQLITE_OK;
          if( lockType==EXCLUSIVE_LOCK ){
-           rc = conchFile->pMethod->xLock((sqlite3_file*)conchFile, SHARED_LOCK);          
+           rc = conchFile->pMethod->xLock((sqlite3_file*)conchFile, SHARED_LOCK);
          }
          if( !rc ){
            rc = conchFile->pMethod->xLock((sqlite3_file*)conchFile, lockType);