From: dan <dan@noemail.net>
Date: Fri, 12 Aug 2011 16:47:12 +0000 (+0000)
Subject: Merge the experimental changes to use a merge-sort when creating an index into the... 
X-Git-Tag: version-3.7.8~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b14e59bfde9d28485d2a93216a3eda35f440c59;p=thirdparty%2Fsqlite.git

Merge the experimental changes to use a merge-sort when creating an index into the trunk.

FossilOrigin-Name: 346a453d1f1d615f1e9e7923a27dad84b8727fb1
---

7b14e59bfde9d28485d2a93216a3eda35f440c59
diff --cc manifest
index 83e86d4850,fe7c0500fd..560005c29f
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Make\sthe\sopenDirectory\sroutine\sin\sos_unix.c\soverrideable\sso\sthat\sit\scan\nbe\sturned\sinto\sa\sharmless\sno-op\sfor\sthe\schromium\ssandbox.
- D 2011-08-10T01:52:12.736
 -C Update\sMakefile.in\sand\sconfigure\sto\saccount\sfor\snew\ssource\sfile\svdbesort.c.
 -D 2011-08-12T16:34:42.929
++C Merge\sthe\sexperimental\schanges\sto\suse\sa\smerge-sort\swhen\screating\san\sindex\sinto\sthe\strunk.
++D 2011-08-12T16:47:12.815
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
+ F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 9fd0401b0134b565a9c7d8ed49dc044cc89f2096
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
@@@ -957,7 -960,7 +960,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P dfa22ed4387f9526b74d5265503c7c8e9d559903
- R bf22196e9aa98f18724e5d2624f7dcbf
- U drh
- Z 2ec35109792cc0dc5d4f7cebd4d85034
 -P 7e515055f219b01dd72df4e27bdcabfa2f9be5c2
++P 6b236069e1ea3c99ff0a007a790d4baebda70b13 69e4b41de22968c565c6575707a73956e3b20ff4
+ R fced7a7577e38a6f428a347e92769773
+ U dan
 -Z 6744e39c2749f1a6bab5f9b9573f4bb7
++Z 3bbbe4efed9782cd51a19bb264baec63
diff --cc manifest.uuid
index ec7b7e54a0,a2262458d0..a9a85f70fe
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6b236069e1ea3c99ff0a007a790d4baebda70b13
 -69e4b41de22968c565c6575707a73956e3b20ff4
++346a453d1f1d615f1e9e7923a27dad84b8727fb1