From: drh <drh@noemail.net>
Date: Sat, 23 Apr 2016 21:16:55 +0000 (+0000)
Subject: Merge the temporary directory search algorithm fix from trunk.
X-Git-Tag: version-3.13.0~53^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d456e92ce05c8f13a2c6dbd10b07d84cab8e8b19;p=thirdparty%2Fsqlite.git

Merge the temporary directory search algorithm fix from trunk.

FossilOrigin-Name: 9b8fec60d8e576cd09e1d075a59bfad1c6169d7a
---

d456e92ce05c8f13a2c6dbd10b07d84cab8e8b19
diff --cc manifest
index cfc0dd778b,366814ad84..395f4ec4d5
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges.
- D 2016-04-23T19:55:59.305
 -C Fix\sthe\sfix\sto\sthe\stemporary\sdirectory\ssearch\salgorithm\sso\sthat\sit\scontinues\nto\sreturn\s"."\sas\sa\sfallback\sif\sthat\sdirectory\shas\sthe\scorrect\spermissions.
 -D 2016-04-23T20:59:23.071
++C Merge\sthe\stemporary\sdirectory\ssearch\salgorithm\sfix\sfrom\strunk.
++D 2016-04-23T21:16:55.627
  F Makefile.in eba680121821b8a60940a81454316f47a341487a
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@@ -361,14 -361,14 +361,14 @@@ F src/os.c 4d83917f072ad958fba9235136fa
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c c96826e21e897bf9c6ae896be9de8d55d63a4ed5
+ F src/os_unix.c 2488a2b6456709ad6398df2302d427a980e2695a
  F src/os_win.c 1997a873bfc8296a701bd8e2df8c3d5da5afe956
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c d20fa46d5beda38095be6070dd4c59e502817c72
 +F src/pager.c cbc8996b773c191107b771424b529307ffdf19ba
  F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
  F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
 -F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
 -F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
 +F src/pcache.c b3230ecfc7f797063fbe167f2845da363e8f07f8
 +F src/pcache.h 6b865be765d1ebd06145219550b10921c7da7cc9
  F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
  F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
@@@ -1486,7 -1484,7 +1486,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P c80c5c62b2e2c5e47e0839f8e2d5b6341ca4a249 67985761aa93fb613b87d340e75371fa55b0f778
- R 473533ddbe833125ff0b6528c3bf66ad
 -P 67985761aa93fb613b87d340e75371fa55b0f778
 -R 0a3904801876ad35cfb663a63395f63c
++P 84da122dd6e70ed603fea781dca204ae2f668c53 b38fe522cfc971b37ca04e7b63a92bbb6e0b01e1
++R 1c713059486f406d1d7b0495652a35d4
  U drh
- Z ff31dea9151360cfbdfa017e3af26788
 -Z 2d6519bfb47a62ce49b104a4f37d1acb
++Z a4b2d03080ca1bec249054a4e309e0ee
diff --cc manifest.uuid
index c7979beb51,f26bce27a6..558a12a798
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 84da122dd6e70ed603fea781dca204ae2f668c53
 -b38fe522cfc971b37ca04e7b63a92bbb6e0b01e1
++9b8fec60d8e576cd09e1d075a59bfad1c6169d7a