From: drh <drh@noemail.net>
Date: Wed, 9 Jan 2013 14:49:37 +0000 (+0000)
Subject: Merge latest trunk changes into the sessions branch, especially the
X-Git-Tag: version-3.13.0~148^2~218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6dcfb85df09f22358e25f72d8411ed4b86f011c;p=thirdparty%2Fsqlite.git

Merge latest trunk changes into the sessions branch, especially the
ORDER BY bug fix of 3.7.15.2.

FossilOrigin-Name: 34af6fac679aeb18ab8349f74e95f3cb6e722ea4
---

e6dcfb85df09f22358e25f72d8411ed4b86f011c
diff --cc manifest
index f7bca61081,d43d6d923f..1c83628cb8
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2013-01-03T22:22:55.634
 -C Fix\san\sover-aggressive\soptimization\sof\sORDER\sBY\son\sa\sthree-way\sjoin\swhere\sthe\nsecond\stable\sis\sUNIQUE\sand\sthe\sORDER\sBY\soccurs\son\sthe\sthird\stable.\nTicket\s[598f5f7596b0557].
 -D 2013-01-09T11:31:17.442
++C Merge\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch,\sespecially\sthe\nORDER\sBY\sbug\sfix\sof\s3.7.15.2.
++D 2013-01-09T14:49:37.244
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in a48faa9e7dd7d556d84f5456eabe5825dd8a6282
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1044,7 -1032,7 +1045,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 4f6d69ae94671df92b976525f75404c01270fef9 45c158b1a015e0295244982e7a61ecc55cca8436
- R 8d2ecc460dcc396acbf742a4b5125040
 -P 7249bfc2ca57624d73f2be0197a9807c58463c48
 -R fcfe7ea587f64ef92e6849f97c544ccd
++P 7e068e39b3b31364271664e0afb1cd95a235c26f 5774f2175ce621dfc4b6b93f7ee13fd66f3ec2b9
++R 101fdb4f64767f317f7e78bca581a816
  U drh
- Z c65bfb73ba1c154a624c7762ce7998dd
 -Z 6e8a59f9682c67ec0cee9fce08b8ae23
++Z 0052399aede3694d61b751e5cf31021b
diff --cc manifest.uuid
index 5b1f7ccacc,104853bdda..34c69ee846
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7e068e39b3b31364271664e0afb1cd95a235c26f
 -5774f2175ce621dfc4b6b93f7ee13fd66f3ec2b9
++34af6fac679aeb18ab8349f74e95f3cb6e722ea4