From: drh <drh@noemail.net>
Date: Tue, 23 Jun 2015 13:02:10 +0000 (+0000)
Subject: Merge the compound SELECT operator fix from trunk.
X-Git-Tag: version-3.8.11~142^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2306712f22dbdaa28e1f0b780f85cd7efb23a5d;p=thirdparty%2Fsqlite.git

Merge the compound SELECT operator fix from trunk.

FossilOrigin-Name: a7be554f4b8534fc237fa4c6defc38fcd4049707
---

a2306712f22dbdaa28e1f0b780f85cd7efb23a5d
diff --cc manifest
index 2e7c75d3cc,609f6bf027..ea07d936b3
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\scomputing\scell\ssizes\sin\sbalance_nonroot()\suntil\sthey\sare\sreally\sneeded.\nThis\sgives\san\soverall\s1.7%\sperformance\sgain\sfor\sabout\s1000\sextra\sbytes\sof\ncode\sspace.
- D 2015-06-23T02:37:30.513
 -C Test\sthat\sthe\sleft\sand\sright\ssides\sof\sa\scompound\sSELECT\soperator\shave\sthe\ssame\s\snumber\sof\sexpressions\sin\sthe\sexpanded\sexpression\slist\sbefore\sbeginning\sto\sgenerate\scode.
 -D 2015-06-23T12:19:55.597
++C Merge\sthe\scompound\sSELECT\soperator\sfix\sfrom\strunk.
++D 2015-06-23T13:02:10.077
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1286,7 -1286,7 +1286,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 168728715156d756ac8c0df45710d054eee027ec
- R 9b9baae7202760bc8528aa5e0a31b7cf
 -P b97f9cf73e503c7285ba3a801e1f932f222d96b2
 -R 5d4925e11483f968b1575f6656e62b8a
 -U dan
 -Z 6c0c66a18bcc0b19ae618b4e0a65b57c
++P 43844537e8a372953386663f8177202901ba7566 4df852ce26c95d5d23c83dbe9c59d2c3435acddf
++R 5a31f6e2047c6b2a76413665b07fcf29
 +U drh
- Z 9735e4632bc637c34becd65ed89566cb
++Z ef941435462213fb596e80b11c30b19f
diff --cc manifest.uuid
index e09e14ca9e,3a395d46f9..c792bcaca0
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 43844537e8a372953386663f8177202901ba7566
 -4df852ce26c95d5d23c83dbe9c59d2c3435acddf
++a7be554f4b8534fc237fa4c6defc38fcd4049707