From: drh <drh@noemail.net>
Date: Mon, 8 Oct 2012 21:51:58 +0000 (+0000)
Subject: Merge ORDER BY optimization refactoring and repair into trunk.
X-Git-Tag: version-3.7.15~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a17ea7ab6f9b7cb0abe28ca0991ee15a9b0802f;p=thirdparty%2Fsqlite.git

Merge ORDER BY optimization refactoring and repair into trunk.

FossilOrigin-Name: c027a9af9137f3346dbb5c5e100a087c2e89797b
---

3a17ea7ab6f9b7cb0abe28ca0991ee15a9b0802f
diff --cc manifest
index 3f3ccd9648,763c801a91..5329b43150
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Manually\sdefine\sthe\sWin32\sfile-mapping\sAPIs\sfor\sWAL\sif\sSQLITE_WIN32_FILEMAPPING_API\sis\sdefined.
- D 2012-10-08T14:36:42.399
 -C All\stest\scases\s(veryquick.tcl\sand\smin.rc)\spass.\s\sA\sfew\sbranch\soperations\sin\nORDER\sBY\soptimization\slogic\sare\suntested\sby\smin.rc.
 -D 2012-10-08T21:01:15.797
++C Merge\sORDER\sBY\soptimization\srefactoring\sand\srepair\sinto\strunk.
++D 2012-10-08T21:51:58.040
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -249,7 -249,7 +249,7 @@@ F src/vtab.c c7671587d07b76582c495d9305
  F src/wal.c e1fe8f92a0ea0fef8faa87ec43a127a478589d22
  F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
  F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
- F src/where.c bf45ec770aa6e5da55d6e9e9405ce990ff6ca201
 -F src/where.c b74866c4c15f0971a997e194699837815e5e628d
++F src/where.c 56916abbd9572487713df7dd41a7cace9e5fae2a
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 0be144b453e0622a085fae8665c32f5676708e00
@@@ -1019,7 -1018,7 +1019,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P 50679889c75cd3205253b1682abfbddc5ff09175 585e2070eef3bc273f23d8e384a1261ee5fff5bd
- R 503e44f3173c52a30e9073d66f146916
- U mistachkin
- Z df468ad55877f504a34141d09c9c3204
 -P bcb4f262476193cfb17818d8c62bab528dddeef9
 -R 530e49166e8d0f53a60bc95ac28c268f
++P 1c2c0a2880dd0ee8862352e307142b8de7e80d13 8314fd6078a3a71aea9d6386ff277cfeb592b4ba
++R b10014ed9089c50b134287e60971b9d3
+ U drh
 -Z efffd1a95fdeb1f2abbf95a65e64a523
++Z c680ce318c399b8bae240279b61ec223
diff --cc manifest.uuid
index 431d08340f,b7ef933b27..cd70e28e94
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1c2c0a2880dd0ee8862352e307142b8de7e80d13
 -8314fd6078a3a71aea9d6386ff277cfeb592b4ba
++c027a9af9137f3346dbb5c5e100a087c2e89797b