From: drh <drh@noemail.net>
Date: Mon, 6 Apr 2015 12:08:24 +0000 (+0000)
Subject: Merge obscure problem fixes from trunk.
X-Git-Tag: version-3.13.0~148^2~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af76530fb0cffa197ad52250778e73de03748799;p=thirdparty%2Fsqlite.git

Merge obscure problem fixes from trunk.

FossilOrigin-Name: 271c110bcf5bf2ea7e113dd01dec876a08e3c047
---

af76530fb0cffa197ad52250778e73de03748799
diff --cc manifest
index b591f4846d,839dc44cc6..b10685e161
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\senhancements\sfrom\strunk.
- D 2015-04-01T16:39:06.530
 -C Fix\sa\sproblem\swith\sfts3\sprefix\sterms\swithin\sphrase\squeries\son\s"order=DESC"\stables\swith\sa\smix\sof\snegative\sand\spositive\srowids.
 -D 2015-04-06T11:04:51.176
++C Merge\sobscure\sproblem\sfixes\sfrom\strunk.
++D 2015-04-06T12:08:24.946
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
 +F Makefile.in 3083cf0c2bc6618e532b9478ce735bb512322985
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
 +F Makefile.msc ffb3a33f21fcc6f7d4b0cc76a981f62f17c62b24
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@@ -245,14 -228,14 +245,14 @@@ F src/pragma.h 09c89bca58e9a44de2116cc8
  F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
  F src/printf.c 8da9a2687a396daa19860f4dc90975d319304744
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
+ F src/resolve.c 41aa91af56d960e9414ce1d7c17cfb68e0d1c6cb
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
+ F src/select.c c28c52e353287434fac8473e56ee4be848d12c9d
 -F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa
 -F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
 +F src/shell.c c4d839ad62f4986891601a21ce629a760f226682
 +F src/sqlite.h.in 64287a2b3432550264a743addbf4162a692fdd1c
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h e974c4f98eba7c578da160dd76a7a34d62d61af2
 -F src/sqliteInt.h 107b02ed6c64162b653acc2368e982de529e14f6
++F src/sqliteInt.h 19c0a189e57a68ae1d971346cb9ac9383fe29692
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -1266,7 -1249,7 +1267,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 df94e61f93da390cb75c48975c50e9d62096ea0b 30011ad2f55cfcacaf23a58ebcc17b17a7b9355e
- R 04f33d7b68cc1c223f924b4251ca247b
 -P edc1de2a588fd50c0049bb2be76d3f6783443165 0cdf502885ea7e5805d7ba3719f055f5d48fc78d
 -R 3d0aeff53f9d343a974360d23614c066
 -U dan
 -Z ac6175e8f164395f5f3f99cbe84625aa
++P aea439bdc6d4d3a8568423171abf381843188826 3ad829e50faca538db3abb2afb898b5521550c5c
++R 6129dbea29890bb446b2e1739ab50b2e
 +U drh
- Z 60b6a96a3758bc5b32bc62eb74cab985
++Z 721c9e42efa32f899b87a4468b9be4bf
diff --cc manifest.uuid
index bc291e8b17,60fdaf0098..f9820554b7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- aea439bdc6d4d3a8568423171abf381843188826
 -3ad829e50faca538db3abb2afb898b5521550c5c
++271c110bcf5bf2ea7e113dd01dec876a08e3c047