From: drh <drh@noemail.net>
Date: Wed, 15 Jun 2011 13:11:06 +0000 (+0000)
Subject: Merge the improved incremental doclist loading test from the
X-Git-Tag: version-3.7.7~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=295b50ce1c128e028d6460e38cf86597b424de1e;p=thirdparty%2Fsqlite.git

Merge the improved incremental doclist loading test from the
broken-build branch (which is now fixed) into trunk.

FossilOrigin-Name: f9750870ee04935f338e4d808900fee5a8b2b389
---

295b50ce1c128e028d6460e38cf86597b424de1e
diff --cc manifest
index 54f991e432,cbdd4b17de..69164f4cd0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\smemory\sleak\sthat\scan\sfollow\san\sOOM\serror\sin\sa\suser-function\sthat\suses\ssqlite3_set_auxdata().
- D 2011-06-14T14:18:45.331
 -C Fix\sso\sthat\sthe\sTCL\stest\sharness\sworks\seven\sif\sSQLITE_ENABLE_FTS\sis\somitted.
 -D 2011-06-15T13:02:21.324
++C Merge\sthe\simproved\sincremental\sdoclist\sloading\stest\sfrom\sthe\nbroken-build\sbranch\s(which\sis\snow\sfixed)\sinto\strunk.
++D 2011-06-15T13:11:06.128
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -945,7 -945,7 +945,7 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P b1f9c1e0ac51cedfb05ac073a603343f6df865b5
- R 915dabb427b7d44a9631a4d5ac3ba884
- U dan
- Z 905532115e84db070a1615e7e8131374
 -P 3899f3b95ed50773a72d907b39b451fefce69c9e
++P 0185c4b689d18d66e6aa39b4a7bddc279e3c9d17 63ebcb52a1909aca80f2fef3e982f8fb5929b73b
+ R fc57a2e2686d2dead5f714ec2e85c3f0
+ U drh
 -Z 950ecff3e7df79fb4044b7edf191f8e4
++Z ece8b2c59ad0a86fa0f8629e77710c29
diff --cc manifest.uuid
index 3952312e3e,e8c5b891b4..2089caf185
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0185c4b689d18d66e6aa39b4a7bddc279e3c9d17
 -63ebcb52a1909aca80f2fef3e982f8fb5929b73b
++f9750870ee04935f338e4d808900fee5a8b2b389