Remove a harmless UMR that occurs inside some debugging code. (CVS 6190)

FossilOrigin-Name: 191c399fc6354b35477ec21f685377e2af26f49b

diff --git a/manifest b/manifest
index 423bfba73f8766da3b3c6275f64a37f2f07de53b..b5ca346b4929ee20c68447749fb4ba524d1faf14 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\schange-counter\sbug\ssimilar\sto\s#3584.\sThis\sone\sis\smuch\smore\sobscure\sthough,\srequiring\sa\stransient\sIO\sor\smalloc\serror\sto\soccur\swhile\srunning\sin\sexclusive\smode.\s(CVS\s6189)
-D 2009-01-16T16:40:14
+C Remove\sa\sharmless\sUMR\sthat\soccurs\sinside\ssome\sdebugging\scode.\s(CVS\s6190)
+D 2009-01-16T23:47:42
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8a00230c566c1a1cfc7ae53eedd458b32034da30
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -140,7 +140,7 @@ F src/os.c ed93a6b46132a602c4fd7a58142e2981c829c79d
 F src/os.h f996ab57d2035a20e63173419055608548a834c6
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
-F src/os_unix.c c0ebce13fac2db7900367e83a3ebbd112ea4e90e
+F src/os_unix.c c74255cc1fcddc38fc3cc1dcf70c2325d3c2948e
 F src/os_win.c 496e3ceb499aedc63622a89ef76f7af2dd902709
 F src/pager.c e8e2ae1ef6a20464a627d29fd4ba29461b7632a5
 F src/pager.h 3345547d4b5b4db323f50d855d91a01837c7f2de
@@ -697,7 +697,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P a353c1ab376b159c4d12532412365318cdbdcc60
-R 0bdccace0ceb1b72a77c9b992ad652ac
-U danielk1977
-Z 007bd5d387bc84161ee29cd1e4862ae7
+P 9f07d2d9226b73c4dc311fd142e0aaba4ffcb078
+R f8c34a8f9197300ef9f780845483fa89
+U drh
+Z c79b9232688b69f59441527d9f82f08a

diff --git a/manifest.uuid b/manifest.uuid
index b153e2afc1b7fcc48d8b0654032c3ba6d249139b..f3ee7e61d8b5ab780843d86b99f1a0e874baa597 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9f07d2d9226b73c4dc311fd142e0aaba4ffcb078
\ No newline at end of file
+191c399fc6354b35477ec21f685377e2af26f49b
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index b7e6f35da135ee825e36de7e143515dfced5b1d1..918a1edf697331fa6f64e65358e1a5e679741a0f 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -43,7 +43,7 @@
 **   *  Definitions of sqlite3_vfs objects for all locking methods
 **      plus implementations of sqlite3_os_init() and sqlite3_os_end().
 **
-** $Id: os_unix.c,v 1.237 2009/01/15 04:30:03 drh Exp $
+** $Id: os_unix.c,v 1.238 2009/01/16 23:47:42 drh Exp $
 */
 #include "sqliteInt.h"
 #if SQLITE_OS_UNIX              /* This file is used on unix only */
@@ -2758,11 +2758,12 @@ static int unixWrite(
     unixFile *pFile = (unixFile*)id;
     pFile->dbUpdate = 1;  /* The database has been modified */
     if( offset<=24 && offset+amt>=27 ){
+      int rc;
       char oldCntr[4];
       SimulateIOErrorBenign(1);
-      seekAndRead(pFile, 24, oldCntr, 4);
+      rc = seekAndRead(pFile, 24, oldCntr, 4);
       SimulateIOErrorBenign(0);
-      if( memcmp(oldCntr, &((char*)pBuf)[24-offset], 4)!=0 ){
+      if( rc!=4 || memcmp(oldCntr, &((char*)pBuf)[24-offset], 4)!=0 ){
         pFile->transCntrChng = 1;  /* The transaction counter has changed */
       }
     }