From: drh <drh@noemail.net>
Date: Fri, 1 Apr 2011 18:39:24 +0000 (+0000)
Subject: Merge the multiplexer enhancements back into the trunk.
X-Git-Tag: version-3.7.6~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d820b42c29bfae9a689b6ac3f76ca746a7acc02b;p=thirdparty%2Fsqlite.git

Merge the multiplexer enhancements back into the trunk.

FossilOrigin-Name: 2c125710cbf04198464d436b16e5ef37c5b219cf
---

d820b42c29bfae9a689b6ac3f76ca746a7acc02b
diff --cc manifest
index 28f120574c,1e425354d0..6d5245d343
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sa\sscript\sthat\swill\sbreak\sthe\samalgamation\ssource\sfile\sup\sinto\s4\sor\s5\nsmaller\ssource\sfiles,\seach\s32K\slines\sor\sfewer,\sand\sa\ssingle\s"sqlite3-all.c"\nsource\sfile\sthat\s#includes\sthe\sothers.
- D 2011-04-01T18:12:58.662
 -C Removed\sdependency\son\ssqliteInt.h\sso\sthat\smultiplex\sVFS\sshim\scan\sbe\scompiled\sas\sloadable\smodule.
 -D 2011-04-01T14:22:46.544
++C Merge\sthe\smultiplexer\senhancements\sback\sinto\sthe\strunk.
++D 2011-04-01T18:39:24.584
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -920,9 -913,8 +921,9 @@@ F tool/speedtest16.c c8a9c793df96db7e49
  F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 +F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 9415201c8a0b9b640f5997c5348c5df812e88230
- R c3ff07e6303499e88c2cf0a9abaa71e9
 -P b3c6d9aa9e2124a2f2a1a5f9dbbd7db3b1d01a31
 -R 5fdb22cfeb915ca0348434fc3aeb88a3
 -U shaneh
 -Z c6a6d5930d83831b14cb5982ae50977b
++P 5d34e64d4d2398aa9a54fd0a4f1de37ced7ea5dd 718f1ad7df9115871ba6159012d3183183fc40a1
++R 3be437ca6e714e1f6c593836a791944c
 +U drh
- Z 975ba0a508eed8e252cfd7014026f442
++Z e8e2d5336305d42bc1912c6d6b830ecf
diff --cc manifest.uuid
index 8128966455,6c14b08a21..57e66f8f57
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5d34e64d4d2398aa9a54fd0a4f1de37ced7ea5dd
 -718f1ad7df9115871ba6159012d3183183fc40a1
++2c125710cbf04198464d436b16e5ef37c5b219cf