From: dan <dan@noemail.net>
Date: Thu, 26 Mar 2015 12:38:20 +0000 (+0000)
Subject: Merge sorter optimization into this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b07bd9caca838d9b34204e64b3b5f9cd28329fc5;p=thirdparty%2Fsqlite.git

Merge sorter optimization into this branch.

FossilOrigin-Name: aeb8e9a9f2092fda0c3e051f135e1d65cf77ff13
---

b07bd9caca838d9b34204e64b3b5f9cd28329fc5
diff --cc manifest
index 9776ba1307,65ccebc2d0..d54c98795b
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthis\sbranch\swith\slatest\strunk\schanges.
- D 2015-03-24T19:43:19.645
 -C Optimize\scases\swhere\sall\sthe\ssorter\sis\ssorting\sa\sset\sof\srecords\sthat\sall\sbegin\swith\sinteger\svalues,\sor\sthat\sall\sbegin\swith\stext\svalues\sto\sbe\scompared\susing\sBINARY.
 -D 2015-03-26T11:55:03.488
++C Merge\ssorter\soptimization\sinto\sthis\sbranch.
++D 2015-03-26T12:38:20.649
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -232,10 -232,10 +232,10 @@@ F src/resolve.c f4d79e31ffa5820c2e3d174
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
  F src/shell.c 3ae1e53878d2804fe77b8c8f1f6ca287a0e5d80e
- F src/sqlite.h.in 2f9606a682af372415ce9d1f244183c5cc8385aa
+ F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 -F src/sqliteInt.h bedf15914c09bfb5fe3ec4e3f211a4a6fc42cd33
 +F src/sqliteInt.h c622684344dd0f008ba5198342426aacec36d9f2
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -1247,7 -1247,10 +1248,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 6f7d9995855bb5ae6dfe75c08a532b26808988b3 436314b5728c9413f9ac2d837e1c19364f31be72
- R fb9135ff0648c32a795a5ec1d3342822
 -P fb076b28c36975ff2e41440f22fe5de115c195da
 -R 1e1c6c1ab8dfb515d00c85e16ae436f0
 -T *branch * sorter-opt
 -T *sym-sorter-opt *
 -T -sym-trunk *
++P 3ccd64eff7ded6d7e918baa3ba096a34d1298040 ce5ad17c25cf2f8274ce304c51e4421faae0b32b
++R f338ba24c380b02f996a7df267204c20
  U dan
- Z 1d28000cf48ee9729ff8277fca616b7d
 -Z 9752268c90db4ae1847219cb63314e99
++Z 8946dba9fbca0cd812ef66fb038505c1
diff --cc manifest.uuid
index ffc561c64e,dfa9f94353..7a9480414f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3ccd64eff7ded6d7e918baa3ba096a34d1298040
 -ce5ad17c25cf2f8274ce304c51e4421faae0b32b
++aeb8e9a9f2092fda0c3e051f135e1d65cf77ff13