Merge latest trunk changes with this branch.

FossilOrigin-Name: e5ca79d2d3c066252b0baa4f76ddbe0ee3b14cb6

diff --cc manifest
index 5dcc60482af20a0a66fb372ceda8f059f862d0af,8dd0ff33909fceaa17121a82fa8db80aaba3e736..f1a113f96b5e05f8aabe5fb4f0a8b384db3cabaf
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Change\sSQLITE_FCNTL_ZIPVFS_PAGER\sto\sSQLITE_FCNTL_ZIPVFS.
- D 2015-02-23T15:41:48.246
 -C Update\sdocument\son\ssqlite3_mprintf()\sand\srelated\sfunctions.\s\sDiscuss\sthe\n%w\sformat\sand\spoint\sout\sthat\sobscure\sANSI-C\sformats\sare\snot\ssupported.\nNo\schanges\sto\scode.
 -D 2015-02-21T15:42:57.800
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-02-23T16:17:46.425
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -250,14 -232,14 +250,14 @@@ F src/resolve.c f4d79e31ffa5820c2e3d174
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54
  F src/shell.c 6276582ee4e9114e0bb0795772414caaf21c0f8e
- F src/sqlite.h.in af7fb18afaacfde7db4ab70903785dbd7a91e851
 -F src/sqlite.h.in 86cddbfdb3155967858c1469108813bcc08eda21
++F src/sqlite.h.in f7df4082533ae9c5acf19bd513e4ff4b638f51d1
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
  F src/sqliteInt.h 57a405ae6d2ed10fff52de376d18f21e04d96609
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c b321464aba1fff1ed9317ebc82a1a94887f97af8
 -F src/tclsqlite.c b8014393a96a9781bb635c8b1f52fc9b77a2bfcf
++F src/tclsqlite.c c7897dcf036c0bb7bd814a0e615723b83bc7df86
  F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
@@@ -805,8 -786,8 +805,8 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 1c2fd1e06f1000c93400bb49df4fff97bccff9e6
 -F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1
 -F test/pragma.test 6cf0f0ce4618e841457aa42745afda55ddbc95fe
++F test/permutations.test 0e2dc2aab7b1043bd2b4404f51651c31da007e52
 +F test/pragma.test 66776f48f533c7248d04c1473deb3ebb792daacd
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -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 ef08ecceb7e237a01af6cc3141dccee09ffe9ae3
- R 5ab6f54d5b1118872361d398d8a0c483
 -P c299e55a661c04f71ab43cb8aed04f8ece6e0567
 -R dda772aafb6dee5a528cc1c5d5a14dc2
 -U drh
 -Z 75f83919b9b483315b93f05f4ef8627c
++P f7865b942834dd2f6b865336e08ba1adbf20612a f8917ba4d917bc762b3b252466ab72a8a70dc0d8
++R 330b1846f73876f19a54b99531a8e2fe
 +U dan
- Z e07f1c54564686b132e0168d58a2ecf5
++Z d8008c2bc531990fbe4786aa324b64a7

diff --cc manifest.uuid
index a61b88572b6502136d9802b6c9a24bd1cf053aa5,c46ad20405c5f645ad5fd2f15da8e7987d5592df..fe869247e77a6bfeb206a312b9319e9f098e28aa
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f7865b942834dd2f6b865336e08ba1adbf20612a
 -f8917ba4d917bc762b3b252466ab72a8a70dc0d8
++e5ca79d2d3c066252b0baa4f76ddbe0ee3b14cb6

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

diff --cc src/tclsqlite.c
index 5cdaa8cbb7a8920dff5bae2ac1802bf3f194df8f,b1d4dc413c504e2720daf9cbd5ef423430f8ae65..075fb6254fd0b416690d427684f618df11b76f62
--- 1/src/tclsqlite.c
--- 2/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@@ -3756,9 -3756,6 +3756,7 @@@ static void init_all(Tcl_Interp *interp
      extern int Sqlitemultiplex_Init(Tcl_Interp*);
      extern int SqliteSuperlock_Init(Tcl_Interp*);
      extern int SqlitetestSyscall_Init(Tcl_Interp*);
- #if SQLITE_ENABLE_OTA
 +    extern int SqliteOta_Init(Tcl_Interp*);
- #endif
  
  #if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
      extern int Sqlitetestfts3_Init(Tcl_Interp *interp);
@@@ -3802,9 -3799,6 +3800,7 @@@
      Sqlitemultiplex_Init(interp);
      SqliteSuperlock_Init(interp);
      SqlitetestSyscall_Init(interp);
- #if SQLITE_ENABLE_OTA
 +    SqliteOta_Init(interp);
- #endif
  
  #if defined(SQLITE_ENABLE_FTS3) || defined(SQLITE_ENABLE_FTS4)
      Sqlitetestfts3_Init(interp);

diff --cc test/permutations.test
index ecf3cdde218cf8322e9c55258c20cb4e4ffc670f,44f62e8066b3d4f44e35d562adb545adcd137f5e..ba49700b7570dff56d458bc5337d1c288d8c2b24
--- 1/test/permutations.test
--- 2/test/permutations.test
+++ b/test/permutations.test
@@@ -113,7 -113,7 +113,7 @@@ set allquicktests [test_set $alltests -
    vtab_err.test walslow.test walcrash.test walcrash3.test
    walthread.test rtree3.test indexfault.test securedel2.test
    sort3.test sort4.test fts4growth.test fts4growth2.test
--  bigsort.test
++  bigsort.test ota.test
  }]
  if {[info exists ::env(QUICKTEST_INCLUDE)]} {
    set allquicktests [concat $allquicktests $::env(QUICKTEST_INCLUDE)]