From: dan <dan@noemail.net>
Date: Thu, 13 May 2010 09:40:30 +0000 (+0000)
Subject: Remerge mistaken test_osinst.c changes.
X-Git-Tag: version-3.7.2~381
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0bfad1171f1bfc7f761083caf45c4574acb1be64;p=thirdparty%2Fsqlite.git

Remerge mistaken test_osinst.c changes.

FossilOrigin-Name: e8c10d3cf601cc81a620f6c0ba5f195945a3f725
---

0bfad1171f1bfc7f761083caf45c4574acb1be64
diff --cc manifest
index 0a6a07624b,fda3df8279..c4c232f0ef
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,5 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C Make\ssure\sxShmGet\sis\snever\scalled\swhile\salready\sholding\sthe\sshared-memory\nsegment.
- D 2010-05-13T09:11:32
 -C Fix\smistake\sin\stest_osinst.c.
 -D 2010-05-13T09:32:31
++C Remerge\smistaken\stest_osinst.c\schanges.
++D 2010-05-13T09:40:30
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -203,8 -200,8 +200,8 @@@ F src/test_journal.c 51da4dd6118ee84334
  F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
  F src/test_malloc.c 2842c922b8e8d992aba722214952204ca025b411
  F src/test_mutex.c ce06b59aca168cd8c520b77159a24352a7469bd3
 -F src/test_onefile.c d9585f6e2056868f208b0c21378a05b68c9ceae2
 +F src/test_onefile.c df4d7858b5cd1dffe92d36ec9dbad11f0037ffd1
- F src/test_osinst.c f5d1a4ee8b80fc58d1430c56146de748584013a9
+ F src/test_osinst.c 1a8074514af1ad5154f010ce87776981558bcfd7
  F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c bbba05c144b5fc4b52ff650a4328027b3fa5fcc6
@@@ -817,14 -814,7 +814,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P bce21c18380715e894eac9c173c97315e0d69d93
- R 97470d84516226b34ff3ad765b139d27
- U drh
- Z 53d0730fb4b18e23e171424c8f97f73d
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFL68JHoxKgR168RlERAqmEAJsHUai08zWM/gjxEILLsvXzMhLccQCfUQaZ
- MSk/bOBCdiASi1PqRIe2N4k=
- =XwOG
- -----END PGP SIGNATURE-----
 -P ee13c8849d234931bb3be36e42383d228b3cbfcb
 -R 3c54081e57eca7df3cbd8d2fe50f86dd
++P 92ebdbc5f64ac63796ff56c1e1aec3b95c6bdd20 4c3e137803f86ec5a6c68bfaa29a2847ba48fd65
++R 7d00cff4c6e3f0c11d419f6f7551e787
+ U dan
 -Z b990d86855026a6a9a402fa4a71fd3d4
++Z 315a0d223a289ca32eb4beaafc7e35cb
diff --cc manifest.uuid
index d24308c401,1d3c3ab5ea..d676561b93
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 92ebdbc5f64ac63796ff56c1e1aec3b95c6bdd20
 -4c3e137803f86ec5a6c68bfaa29a2847ba48fd65
++e8c10d3cf601cc81a620f6c0ba5f195945a3f725