diff --git a/manifest b/manifest index 70f1de0b76..2b7b4027a5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Modify\sthe\sformat\sof\sthe\swal-index\sto\suse\sa\shash\stable\sto\sindex\slog\sfile\ssegments. -D 2010-05-10T14:46:09 +C Merge\s[96d6eaf4d2]\sand\s[40b0a6357b]. +D 2010-05-10T18:10:18 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -152,7 +152,7 @@ F src/os.c aec6922553585a25d5655666defc125a7e217674 F src/os.h b389844e5469a2918e8a45fe6ae52b4c28dfb2b2 F src/os_common.h 0d6ee583b6ee3185eb9d951f890c6dd03021a08d F src/os_os2.c 8ad77a418630d7dee91d1bb04f79c2096301d3a0 -F src/os_unix.c 164d85df39df72fb1e9611cbf723f9287e622d98 +F src/os_unix.c f3a7ea94e5b59b602d6a6981489554dabcd9c88b F src/os_win.c a8fc01d8483be472e495793c01064fd87e56a5c1 F src/pager.c a47af9c2c9ca425bd68642d61764266331a3323f F src/pager.h 934b598583a9d936bb13c37d62a2fe68ac48781c @@ -813,7 +813,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 6ecdc7ba2b5e79e8b5862fb49cf6c2b99a40659a -R d05ea03295a9fb019dfbc21cf1e7b6fc +P 40b0a6357b160e04326ab176955a68a1cf3f8b7c 96d6eaf4d2be453191b36875811d9556ad0763ed +R 37996b296fbd165c26242b3ad78ab5eb U dan -Z acd3bcc163b4a5bf1cebc63a218dff15 +Z 33e8496ccc7b964e8849eef5eb4645d8 diff --git a/manifest.uuid b/manifest.uuid index 5de47f9cf5..1b7532601f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -40b0a6357b160e04326ab176955a68a1cf3f8b7c \ No newline at end of file +c67756c404669141fa06a1ce3f1efadefa277bc6 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index b7659dd34d..8c10d1ed33 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -6127,7 +6127,7 @@ static int proxyTakeConch(unixFile *pFile){ ** If pFile holds a lock on a conch file, then release that lock. */ static int proxyReleaseConch(unixFile *pFile){ - int rc; /* Subroutine return code */ + int rc = SQLITE_OK; /* Subroutine return code */ proxyLockingContext *pCtx; /* The locking context for the proxy lock */ unixFile *conchFile; /* Name of the conch file */