diff --git a/manifest b/manifest index a81ba1608d..d9d042fdaf 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Clear\sa\sglobal\svariable\sin\se_fts3.test\sbefore\sit\sis\sused. -D 2010-04-12T19:43:43 +C Recent\schanges\scause\sthe\sxSync\smethod\sof\sthe\smemory\sjournal\simplementation\nto\sbe\sused,\sso\sremove\sthe\sassert(0). +D 2010-04-12T19:44:23 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -141,7 +141,7 @@ F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2 F src/mem2.c 2ee7bdacda8299b5a91cff9f7ee3e46573195c38 F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3 F src/mem5.c eb7a5cb98915dd7a086fa415ce3a5a0f20d0acff -F src/memjournal.c 5bfc2f33c914946e2f77ed3f882aff14dfc9355d +F src/memjournal.c f3be374af30588de297dcf678925b2a4758e4135 F src/mutex.c 581a272e09098040ca3ef543cb5f3d643eff7d50 F src/mutex.h 6fde601e55fa6c3fae768783c439797ab84c87c6 F src/mutex_noop.c 5f58eaa31f2d742cb8957a747f7887ae98f16053 @@ -800,14 +800,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 51a613950824698687c0db83b7884db33d45f7f5 -R ff89b38a0a4a8fecbd176e1ed262b9c3 +P ae89dfd26b65fb1a3633a4338f5cb5e54a7d2035 +R 1fd72ebc321ad90b597550b67392160f U drh -Z 08eb609a7934096f724eca11d8ed75b5 +Z 0794d323ac548fe92e3d7347c04ad222 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFLw3fyoxKgR168RlERApVMAJ9f1yTVR1hBKqFZPhPTgmDsmIYfuACffsYB -gJYRnEpMu05BFGT/ycW9PUI= -=ZWEh +iD8DBQFLw3gaoxKgR168RlERAhOvAKCMwBUAU5LgdJlGE1Wpcg7e+X5SWgCeKxdR +H+SY4j6giHqJOHvYiTWkJlo= +=TTDT -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index f0b03e07c7..6d9f4eec97 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ae89dfd26b65fb1a3633a4338f5cb5e54a7d2035 \ No newline at end of file +1f2cb9402838373f6370660dfc885013df079895 \ No newline at end of file diff --git a/src/memjournal.c b/src/memjournal.c index 0d81ecff7c..f042475dc9 100644 --- a/src/memjournal.c +++ b/src/memjournal.c @@ -196,11 +196,10 @@ static int memjrnlClose(sqlite3_file *pJfd){ ** exists purely as a contingency, in case some malfunction in some other ** part of SQLite causes Sync to be called by mistake. */ -static int memjrnlSync(sqlite3_file *NotUsed, int NotUsed2){ /*NO_TEST*/ - UNUSED_PARAMETER2(NotUsed, NotUsed2); /*NO_TEST*/ - assert( 0 ); /*NO_TEST*/ - return SQLITE_OK; /*NO_TEST*/ -} /*NO_TEST*/ +static int memjrnlSync(sqlite3_file *NotUsed, int NotUsed2){ + UNUSED_PARAMETER2(NotUsed, NotUsed2); + return SQLITE_OK; +} /* ** Query the size of the file in bytes.