From: dan <dan@noemail.net>
Date: Fri, 6 May 2011 13:58:03 +0000 (+0000)
Subject: Merge windows test case fixes. No changes to code.
X-Git-Tag: version-3.7.7~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fa104889c30d30fd23ae7da3b47ca603b41e84f;p=thirdparty%2Fsqlite.git

Merge windows test case fixes. No changes to code.

FossilOrigin-Name: 2e5c0ed724060388b97e0c0881bb1b68ec1a23b4
---

7fa104889c30d30fd23ae7da3b47ca603b41e84f
diff --cc manifest
index b1e07258d5,4a3dc78b27..07f26c7f2b
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Increase\sthe\siVersion\sfor\ssqlite3_module\sneeded\sfor\sthe\sxSavepoint,\nxRelease,\sand\sxRollbackTo\smethods\sfrom\s1\sto\s2.\s\sThis\sis\sso\sthat\sit\swill\nconform\sto\spublished\sdocumentation.
- D 2011-05-06T00:19:57.229
 -C Changes\sto\svarious\stest\sscripts\sso\sthat\sthey\spass\son\swindows.
 -D 2011-05-05T19:44:22.749
++C Merge\swindows\stest\scase\sfixes.\sNo\schanges\sto\scode.
++D 2011-05-06T13:58:03.997
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -933,7 -933,10 +933,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 22cbc01a2600c6100112315d9afb5f2d8f80b3df
- R ecae535d3c90fbfa52eb2d1910d430f2
- U drh
- Z af2b86f0a254fd9cb92b70349edf3021
 -P f0617d619dc6654f6d27543999c0aad724a0d967
 -R 70a14d63b609930237281c63ad04d09e
 -T *branch * win32-test-fixes
 -T *sym-win32-test-fixes *
 -T -sym-trunk *
++P 0f4954e9793332573d4ffa0c1e199180f4cb990a 1586244b6d86d5a98af8c6f7a8324672e02df9c3
++R 591f03e045e4939df2af715bb8fd363a
+ U dan
 -Z d02b41e7d78bb6d169c1442486a8fed7
++Z 39348870ee2abc5635df70a7deb111a7
diff --cc manifest.uuid
index 59476c6ef8,530cb38e6f..860c075a22
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0f4954e9793332573d4ffa0c1e199180f4cb990a
 -1586244b6d86d5a98af8c6f7a8324672e02df9c3
++2e5c0ed724060388b97e0c0881bb1b68ec1a23b4