Merge latest trunk changes with this branch.

FossilOrigin-Name: 6f5888a5e430feb5d9a50009a2eb103d9945bd22

diff --cc manifest
index 3b56f954fd0873dfce8d4c1a96bf19e2d99b0dc7,df5da3164fe072224a8e540068e011064d55fa03..4d38e28cd7cef4c68e1ab39eda3bf623deecb634
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\stests\sfor\sa\scouple\sof\spreviously\suntested\sbranches\sin\sthe\sota\scode.
- D 2015-02-19T13:36:02.845
 -C Move\sthe\sos_unix.c\sfile\scloser\sto\sapple-osx.
 -D 2015-02-19T02:43:02.884
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-02-19T14:41:24.386
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -249,8 -231,8 +249,8 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54
- F src/shell.c 82c25508dac802b32198af6f5256ca1597c6a1af
- F src/sqlite.h.in ad5cdebfdd8bcef2534f93de6b8466b4c455a032
+ F src/shell.c 6276582ee4e9114e0bb0795772414caaf21c0f8e
 -F src/sqlite.h.in b02d8d19c5adc73bd02b225054103247aff64425
++F src/sqlite.h.in ffa60a89ebc7d2ac7140680a6a189dbced6b72c3
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
  F src/sqliteInt.h 57a405ae6d2ed10fff52de376d18f21e04d96609
@@@ -269,11 -251,11 +269,11 @@@ F src/test8.c 610e3d523018ca63b08081795
  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_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c e7b2e1634324d746aa5e1c7e0929470e8be27953
 +F src/test_config.c a55a18bbbb117eab92e4343f7ee753b25e0aee49
- F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
+ F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
  F src/test_func.c 14e543ae4d905ee31dc322b2f8d31bfac1769d45
@@@ -1258,7 -1239,7 +1258,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 0864d127fe42fc0db7ab30a3ebf74c0114095648
- R dd716412c97fca8f0f6fe7ccf55a32c1
 -P 28284ccc0d7301503f6d2d7bee9093738d52e331
 -R de5d87b1cb4f744ff7cb90b036adcd40
 -U drh
 -Z 45842533d15e073070e1f1a9e9241135
++P a3c1bc5d5e3f4b197f48cbbc240608e94bfc2b45 81f242e338d6122e27aad86986bfd140012c6582
++R d299d5655569d5895ceed70c48c0588b
 +U dan
- Z 5a79311824410c4dc238effcc077c46a
++Z b1c159c49abb337fc6eddedfd6fb5f7b

diff --cc manifest.uuid
index 7f8a7ebad30eb0ee00bd1e57ce0d1d98a415adc7,084bab91e8cc158dede43339e7299f08baa776c4..d8db68537e7549d575d5209172f2ad3dcf09de0a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a3c1bc5d5e3f4b197f48cbbc240608e94bfc2b45
 -81f242e338d6122e27aad86986bfd140012c6582
++6f5888a5e430feb5d9a50009a2eb103d9945bd22

diff --cc src/sqlite.h.in
index 095ee73f89353a4cc1789ea4818740a7c18ef962,8a358dbb2f994d68d1118a3d7f87f4374e01c90c..9499595acc6ca50d805c9243abea420da430b1bb
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -969,9 -965,13 +969,15 @@@ struct sqlite3_io_methods 
  #define SQLITE_FCNTL_SYNC                   21
  #define SQLITE_FCNTL_COMMIT_PHASETWO        22
  #define SQLITE_FCNTL_WIN32_SET_HANDLE       23
 +#define SQLITE_FCNTL_ZIPVFS_PAGER           24
 +#define SQLITE_FCNTL_OTA                    25
  
+ /* deprecated names */
+ #define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
+ #define SQLITE_SET_LOCKPROXYFILE      SQLITE_FCNTL_SET_LOCKPROXYFILE
+ #define SQLITE_LAST_ERRNO             SQLITE_FCNTL_LAST_ERRNO
+ 
+ 
  /*
  ** CAPI3REF: Mutex Handle
  **