Merge all recent trunk enhancements and fixes into the apple-osx branch.

FossilOrigin-Name: 74b7bf17446bc21a73fa5b75c2942b5660b0ad7e

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index f87f6d750f81bcdf535aaa1fed210f267b2694f7,98ea026575cdbe1a68106bb2077ad08a8ab4bb35..d335be7650577b30cdd8e7423be90fd5dbca45bb
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\strunk\sfixes\sand\senhancements\sinto\sthe\sapple-osx\sbranch.
- D 2015-04-15T13:51:38.292
 -C Add\san\sALWAYS()\saround\sa\snew\sbranch\sthat\swas\smade\sunreachable\sby\san\seven\nnewer\schange.
 -D 2015-04-20T01:13:33.830
++C Merge\sall\srecent\strunk\senhancements\sand\sfixes\sinto\sthe\sapple-osx\sbranch.
++D 2015-04-20T01:25:56.443
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in d4fe123ecc0734164d927b3946bc69c98c579528
 -F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
++F Makefile.in 0dc7ac539680061505b2a3516299ae9a7e4595cd
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 0078f5781538e07ea38683439f38d5f5ab79ab6e
+ F Makefile.msc a19bceec468fa18bb54df52257b1a2211e69172d
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
@@@ -155,7 -152,7 +155,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 5fcef49677a2ba6c1f2e9eb3dbae3e41c91f549d
 -F main.mk 60aba7d38b9bd73e249693344dd8405aa24ac02a
++F main.mk 2dcfa4c8133f4a3aad763fd00d4cf39ee35a084a
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -176,10 -173,10 +176,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 66bb78f5a2d38e27b933848e70a97483ebbbe796
 -F src/btree.c 127aceb71ba93f59bc9c6ba810e992a04299e98a
++F src/btree.c d061b108bed81feeac24703a5b5a91153cabafb6
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
- F src/build.c 01b969b20a44a3d9620e597d9af8242348123540
+ F src/build.c e246c2cea69c8f6fc825a156ea2de9dd4a17f18b
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
@@@ -193,12 -190,12 +193,12 @@@ F src/global.c 4f77cadbc5427d00139ba43d
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 305dd3f9539d0affa4bf1c14cc7dffb34867e040
+ F src/insert.c b152e71457c40a3967ceafa9e7cbbb52e9ead2c1
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
 -F src/main.c 40e333960d53f7d50ee8ce09d40431c87ea653f2
 +F src/main.c a5e55e2b1849352de79260ad277f8ffeb0c4b76e
  F src/malloc.c 6a370b83d54e4bbf6f94021221c2a311cff26a18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -217,29 -214,28 +217,29 @@@ 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 5ed7e2e453c2980909a6b2c80dc55764b50819a8
 -F src/os_win.c 03d27be3a20048ef52a648d5f0a15f5edda9f2a3
 +F src/os_unix.c acd575b6c0dc94afe3a5a21cf789ca1793261feb
 +F src/os_win.c 93f8662844dc935280a1851d15c823f1e6857408
  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 1299c66e7b1707322ccd8af43a359b8fb0d46d72
+ F src/parse.y c4e0387bc88c8e21e5ba653e2578959a1f3cdbc7
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9
- F src/pragma.c db44f204be8289e43d6a7f728bbfe3cdf0c9c906
 -F src/pragma.c 2a81f312cdb78bf0672a0484478ca3c1083028e9
++F src/pragma.c 17e0049780fee7594233d627ad8da19a81a335c7
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
- F src/prepare.c 01740b0d6b8f5c6da421a86c300464ff5b53e167
 -F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3
++F src/prepare.c 5be49833da7f82806a4957cb91ad4e8f2453808f
  F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 66cfe49a9c3b449ef13b89a8c47036a4ed167eab
+ F src/resolve.c 53486a98c17b7ae09b8c2b398013e973ce4c1aae
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c ee49a7bf39b9ba7ada6d944c1a11fecb7157551e
- F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa
 -F src/select.c 361dfc32244656bbe3f0e53d8ed791b3ec0c4be8
++F src/select.c 217d181aaf31e12c4a94905dd12c21e1ca76c67d
+ F src/shell.c 28b3e1174a7fc00155d7d00880a33589a88508c9
 -F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
 +F src/sqlite.h.in a57fba23bfa1b17e60e6bd682f9614ab59272390
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 92d2e2925bb33a29ef7cebd251afec81081411db
 -F src/sqliteInt.h 3a1fccc2bb62ab16750730b6f6f24305e686a0ce
++F src/sqliteInt.h 892e58b816cb9588e4ff0e39628372b628a3e1cf
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -291,25 -287,25 +291,25 @@@ F src/test_vfs.c b7e6831e6fcf04c5090acc
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
- F src/tokenize.c a8234a67577308935cdf13e618cd66556f5f45d1
- F src/trigger.c 69a91bed7c94e46223e37ffccfeeb35e34b999ac
+ F src/tokenize.c b7fb584c2be5ec39b6fdf04b185e7c6f33f8dc15
+ F src/trigger.c bc647c712454c9b209fac082bb82870b5fd6fa54
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
+ F src/util.c a6431c92803b975b7322724a7b433e538d243539
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 7b63a9dfdae77949cd41f1ce6f0eaa9af78609e6
 -F src/vdbe.c f0cf3cf527d5a40b8d5d2324fdbb31da6c90cd8b
++F src/vdbe.c 32e165d7a3b701ad7ec251176dc64a357740d8f8
  F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
  F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
 -F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 -F src/vdbeaux.c 03591cca98ec50e1493043f0ff7abbece0b9c83d
 +F src/vdbeapi.c 36861a49fcb11325e2fce937418b06ce1e3de1a8
- F src/vdbeaux.c 8d4b5165fbf4fed0ed7fd0f657368965383d2d55
++F src/vdbeaux.c 85b76767552077c3f4d169cefb74833bc60cdb1a
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
  F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
  F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
- F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
- F src/vtab.c 9ca557215e8591ceb66e0b7c0a579c6df1e54b2d
+ F src/vdbetrace.c f95c2dff9041fcf07f871789c22ebb0648ea0b7c
+ F src/vtab.c 5f81f8a59c1f5ddb94c918f25ed5d83578fcc633
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 753995db83247f20361a8e8a874990b21a75abd9
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c de15f46df1161b925a9a509b39bc750f1951cdd7
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
  F src/where.c 8ba8ff31dc9bf1b69fe771d35d8764d5a1efd310
  F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
@@@ -503,9 -499,9 +503,9 @@@ F test/exclusive.test c0d5e3c0756ac6ccd
  F test/exclusive2.test 32798111aae78a5deec980eee383213f189df308
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 8f7b27b61c2fbe5822f0a1f899c715d14e416e30
- F test/expr.test c4b9bf0cc60b26862475e19999fbd2609ca8259c
+ F test/expr.test 79c3e7502d9e571553b85f0ecc8ff2ac7d0e4931
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
 -F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
 +F test/fallocate.test fe52076a43ff99da8411990dbb4f374e81e88c85
  F test/filectrl.test 14fa712e42c4cb791e09dfd58a6a03efb47ef13a
  F test/filefmt.test cb34663f126cbc2d358af552dcaf5c72769b0146
  F test/fkey1.test e1d1fa84cde579185ea01358436839703e415a5b
@@@ -799,7 -794,7 +799,7 @@@ F test/pcache.test 488061b5dd685df2234d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1
- F test/pragma.test 28748a49b4213aeeae9939257ae486fef09b005a
 -F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2
++F test/pragma.test 69cc5c349f86bd06ca52f73c501ff1cee940126f
  F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
@@@ -1255,7 -1251,7 +1256,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 e709d3b4e7b91331f58ed8319f98790cfb190cb1 bd06eeb8d06237dc2d54d8a03e8bf525cb811c9e
- R f034ab8024215b05e2d8221a81ae3b34
 -P c83052e48bbae0f45db2a44155b4e5482ee4a901
 -R 952a9e0aae8c56d03933920a47e90909
++P bfc7142ad295c4b04078f9c01030bdbd15f024e8 592c010478fba7410424f011a62e019c826f1ac3
++R 65a49022ceca7cc6e1f2dfc581f9ff77
  U drh
- Z 8ae6163cdf4d66ea49f55e3eb7c94bf7
 -Z b000b63de0ad5ddbe40a2bc087fe2878
++Z 2ba0195ba41fcb8cc4ac8903189d5cd1

diff --cc manifest.uuid
index f1499908e88a8aad12cc9bf64f8cc947e044bf78,0e878dee1e1b21660b3d8b661e90fe0127104c41..8c2c4796ad501978083c408511462659ae92aaf4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bfc7142ad295c4b04078f9c01030bdbd15f024e8
 -592c010478fba7410424f011a62e019c826f1ac3
++74b7bf17446bc21a73fa5b75c2942b5660b0ad7e

diff --cc src/btree.c
Simple merge

diff --cc src/pragma.c
index 8d9aaf844e8c640ffdd5170e28ebf16630c69215,614daa54dfb069c92a401c55d43c028c191f3d05..a69e42ad607b2ff424a253f7db373a5c4b08bf23
--- 1/src/pragma.c
--- 2/src/pragma.c
+++ b/src/pragma.c
@@@ -961,8 -946,9 +961,11 @@@ void sqlite3Pragma
          sqlite3ErrorMsg(pParse, 
              "Safety level may not be changed inside a transaction");
        }else{
-         pDb->safety_level = (getSafetyLevel(zRight,0,1)+1)
 -        int iLevel = (getSafetyLevel(zRight,0,1)+1) & PAGER_SYNCHRONOUS_MASK;
++        int iLevel = (getSafetyLevel(zRight,0,1)+1)
 +                                      | SQLITE_SAFETYLEVEL_FIXED;
++        iLevel &= PAGER_SYNCHRONOUS_MASK;
+         if( iLevel==0 ) iLevel = 1;
+         pDb->safety_level = iLevel;
          setAllPagerFlags(db);
        }
      }

diff --cc src/prepare.c
Simple merge

diff --cc src/select.c
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 test/pragma.test
Simple merge