From ceb92adb9de0870e7f6a9a8b7543cf0001e6d5eb Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 10 Jan 2009 17:02:02 +0000 Subject: [PATCH] Remove an faulty assertion inserted a few days ago. (CVS 6160) FossilOrigin-Name: 495f017e03f32420e6a6a7685125a86929cef142 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/pager.c | 9 +-------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/manifest b/manifest index 7fd6300f6b..9b2b4a1485 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C When\scompiled\swith\sSQLITE_DEBUG\s(in\sother\swords,\swhen\sassert()\sis\senabled)\nthe\sALWAYS\sand\sNEVER\smacros\swill\sthrow\san\sassertion\sif\stheir\sarguments\sare\nnot\strue\sor\sfalse,\srespectively.\s(CVS\s6159) -D 2009-01-10T16:15:21 +C Remove\san\sfaulty\sassertion\sinserted\sa\sfew\sdays\sago.\s(CVS\s6160) +D 2009-01-10T17:02:03 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 05461a9b5803d5ad10c79f989801e9fd2cc3e592 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -142,7 +142,7 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5 F src/os_unix.c 7825c6178597713382d74adbf8c8c00ffcdc42d4 F src/os_win.c 496e3ceb499aedc63622a89ef76f7af2dd902709 -F src/pager.c a1e23f2c55bda1303cb6236d4aca9666e58eb610 +F src/pager.c 98c6b2aa232b397ccbcd8ad5a1887af1960de576 F src/pager.h 9870acb2d653848d90d765d7cbf163496d6c8111 F src/parse.y 4d0e33a702dc3ea7b69d8ae1914b3fbd32e46057 F src/pcache.c 16dc8da6e6ba6250f8dfd9ee46036db1cbceedc6 @@ -696,7 +696,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 855c4093cf331496d9ef508011ad814e91e3882f -R b9c742fffe6a789dace921fa1885cb8a +P 64a8dcd8d6152108809e4d10c459f1de5d36a435 +R 7b65d75c1e2466a966ed478bca81db53 U drh -Z 36a241c258b9ef95ddefc24be4403954 +Z 40ffa60b829dc2606c8d956617c41646 diff --git a/manifest.uuid b/manifest.uuid index 7222b7ed7f..14ca25a846 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -64a8dcd8d6152108809e4d10c459f1de5d36a435 \ No newline at end of file +495f017e03f32420e6a6a7685125a86929cef142 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index baae60ec22..0e66f8e4e8 100644 --- a/src/pager.c +++ b/src/pager.c @@ -18,7 +18,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id: pager.c,v 1.545 2009/01/10 16:15:09 danielk1977 Exp $ +** @(#) $Id: pager.c,v 1.546 2009/01/10 17:02:03 drh Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" @@ -3637,19 +3637,12 @@ int sqlite3PagerWrite(DbPage *pDbPage){ ** writing to any of these nPage pages may damage the others, the ** journal file must contain sync()ed copies of all of them ** before any of them can be written out to the database file. - ** - ** 2009-01-07: This block of code appears to be a no-op. I do not - ** believe it is possible for any page on the sector to not have - ** the PGHDR_NEED_SYNC flag set. The "pPage->flags |= PGHDR_NEED_SYNC" - ** line below does nothing, I think. But it does no harm to leave - ** this code in place until we can definitively prove this is the case. */ if( needSync ){ assert( !MEMDB && pPager->noSync==0 ); for(ii=0; iiflags & PGHDR_NEED_SYNC ); /* 2009-01-07 conjecture */ pPage->flags |= PGHDR_NEED_SYNC; sqlite3PagerUnref(pPage); }