From: drh <drh@noemail.net>
Date: Wed, 15 Apr 2015 13:51:38 +0000 (+0000)
Subject: Merge recent trunk fixes and enhancements into the apple-osx branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8c1a641b112760bf9976935de7b75f600d69bd8;p=thirdparty%2Fsqlite.git

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

FossilOrigin-Name: bfc7142ad295c4b04078f9c01030bdbd15f024e8
---

e8c1a641b112760bf9976935de7b75f600d69bd8
diff --cc manifest
index c07e5d7f53,7337ec7673..f87f6d750f
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sall\srecent\strunk\senhances\sinto\sthe\sapple-osx\sbranch.
- D 2015-04-13T23:11:45.828
 -C Remove\san\sincorrect\sassert()\sstatement\sfrom\ssqlite3Fts3Dequote().
 -D 2015-04-15T09:16:39.633
++C Merge\srecent\strunk\sfixes\sand\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2015-04-15T13:51:38.292
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
 +F Makefile.in d4fe123ecc0734164d927b3946bc69c98c579528
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 0078f5781538e07ea38683439f38d5f5ab79ab6e
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -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 67648f6532c2da79d3b3fb6853aa1a0c3ba0e1ad
 +F src/btree.c 66bb78f5a2d38e27b933848e70a97483ebbbe796
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
- F src/build.c fa4795bc795077388aa4e746e1b25ef97bc10489
+ F src/build.c 01b969b20a44a3d9620e597d9af8242348123540
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
@@@ -226,20 -223,19 +226,20 @@@ F src/parse.y 1299c66e7b1707322ccd8af43
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9
- F src/pragma.c 21af63d913216da9ee45774bc381b9bd781d3a63
 -F src/pragma.c 3965ae4e82bed39fb97ce04c5fe18c9bc3ee6a88
++F src/pragma.c db44f204be8289e43d6a7f728bbfe3cdf0c9c906
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
 -F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
 +F src/prepare.c 01740b0d6b8f5c6da421a86c300464ff5b53e167
- F src/printf.c 8ae1fa9d30c1200a9268a390ba9e9cea9197b27a
+ F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 41aa91af56d960e9414ce1d7c17cfb68e0d1c6cb
+ F src/resolve.c 66cfe49a9c3b449ef13b89a8c47036a4ed167eab
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 8859ea21c0c9c66d85d840aaba75a492d8c4c844
 -F src/select.c 93260bc9e7e0e6dfe1b7cb8815b0ed4cad8be9e3
++F src/select.c ee49a7bf39b9ba7ada6d944c1a11fecb7157551e
  F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa
- F src/sqlite.h.in 1d97dd551627efe9284ec65251cbf862fcb1a96d
 -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 90b7bfd89d7307cd0750663da419ba4bb81e7379
 +F src/sqliteInt.h 92d2e2925bb33a29ef7cebd251afec81081411db
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -308,12 -304,12 +308,12 @@@ F src/vdbesort.c 2e7f683464fd5db3be4bea
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c 9ca557215e8591ceb66e0b7c0a579c6df1e54b2d
  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 9952e4749f481707595692f2f13d3ce3b64ffdc8
+ F src/where.c 8ba8ff31dc9bf1b69fe771d35d8764d5a1efd310
  F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -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 2886007790614c52f5e1489936f82a4b6be42927
 -F test/pragma.test e6605ce89c66db930aef561e43a22281a09ffc66
++F test/pragma.test 28748a49b4213aeeae9939257ae486fef09b005a
  F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
@@@ -1255,7 -1250,7 +1255,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 301218704cfb6eebac32828b7b2dbc6803c63a26 211411d02c0729c9af0e3cc7e4910db2e7e0d08e
- R 1b6bb6863ad77c6c0aa961642d41539d
 -P fa0956edf866f48f448967836709a3ad822ff917
 -R ae90fdb352a7af37163dde65a0adec8a
 -U dan
 -Z a5cd9462fba20ef05f7047cbd877b3d9
++P e709d3b4e7b91331f58ed8319f98790cfb190cb1 bd06eeb8d06237dc2d54d8a03e8bf525cb811c9e
++R f034ab8024215b05e2d8221a81ae3b34
 +U drh
- Z 659f5a76bd1e1fcea25a13b02607911a
++Z 8ae6163cdf4d66ea49f55e3eb7c94bf7
diff --cc manifest.uuid
index 63002ea93c,6c106f0137..f1499908e8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e709d3b4e7b91331f58ed8319f98790cfb190cb1
 -bd06eeb8d06237dc2d54d8a03e8bf525cb811c9e
++bfc7142ad295c4b04078f9c01030bdbd15f024e8