From: dan <dan@noemail.net>
Date: Wed, 11 Dec 2013 11:03:19 +0000 (+0000)
Subject: Have the crash-test infrastructure code in test6.c read and write the 512-byte block... 
X-Git-Tag: version-3.8.3~101^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d8b85bed183517991ec87e1df99bce768e4d913;p=thirdparty%2Fsqlite.git

Have the crash-test infrastructure code in test6.c read and write the 512-byte block containing the pending-byte lock as normal. Earlier versions did not access this part of the file in order to avoid triggering an assert in os_unix.c. But the assert() has since been removed. And not reading/writing this part of the file causes problems for multiplexor tests.

FossilOrigin-Name: fdc3f3fa3de1481860e1e2a819db2d6c4eb05658
---

diff --git a/manifest b/manifest
index c2e2f5f1bb..8b592a7952 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sSQLITE_FCNTL_SYNC\sinstead\sof\sSQLITE_FCNTL_SYNC_OMITTED.\sAdd\sdocumentation\sin\sfor\sFCNTL_SYNC\sand\sFCNTL_COMMIT_PHASETWO.
-D 2013-12-10T17:34:53.300
+C Have\sthe\scrash-test\sinfrastructure\scode\sin\stest6.c\sread\sand\swrite\sthe\s512-byte\sblock\scontaining\sthe\spending-byte\slock\sas\snormal.\sEarlier\sversions\sdid\snot\saccess\sthis\spart\sof\sthe\sfile\sin\sorder\sto\savoid\striggering\san\sassert\sin\sos_unix.c.\sBut\sthe\sassert()\shas\ssince\sbeen\sremoved.\sAnd\snot\sreading/writing\sthis\spart\sof\sthe\sfile\scauses\sproblems\sfor\smultiplexor\stests.
+D 2013-12-11T11:03:19.250
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -234,7 +234,7 @@ F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
 F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
 F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
-F src/test6.c 6884dcfb1d04c26083ffb441ab329043967c09e5
+F src/test6.c 0c8fdf2e875ab23bb7fab6dee1a2c4c4ff03f5b0
 F src/test7.c 72b732baa5642f795655ba1126ea032af46ecfd2
 F src/test8.c c7aab1d9fbbf54fc33d43b73aa24aa55f9eaf534
 F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
@@ -1146,7 +1146,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 3ee736a39d1fc175a297c5fdd0d2e1c5a9b5b18e
-R 00ff1143b8ee30f4eb0b986958de8c12
+P 46231af985a1a872d1dc3418591cbaacb0b7c249
+R cf82896d56fef77694a1be0de6074b9d
 U dan
-Z 4539dd639fdb6689f35ca693fd45b226
+Z ff5d29c735004d7eb85a84bef2a95faa
diff --git a/manifest.uuid b/manifest.uuid
index 5e83f3adb2..fe1cfc392c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-46231af985a1a872d1dc3418591cbaacb0b7c249
\ No newline at end of file
+fdc3f3fa3de1481860e1e2a819db2d6c4eb05658
\ No newline at end of file
diff --git a/src/test6.c b/src/test6.c
index fb94363c36..0d0cf2c2f1 100644
--- a/src/test6.c
+++ b/src/test6.c
@@ -173,9 +173,6 @@ static void *crash_realloc(void *p, int n){
 static int writeDbFile(CrashFile *p, u8 *z, i64 iAmt, i64 iOff){
   int rc = SQLITE_OK;
   int iSkip = 0;
-  if( iOff==PENDING_BYTE && (p->flags&SQLITE_OPEN_MAIN_DB) ){
-    iSkip = 512;
-  }
   if( (iAmt-iSkip)>0 ){
     rc = sqlite3OsWrite(p->pRealFile, &z[iSkip], (int)(iAmt-iSkip), iOff+iSkip);
   }
@@ -643,7 +640,6 @@ static int cfOpen(
       for(iOff=0; iOff<pWrapper->iSize; iOff += 512){
         int nRead = (int)(pWrapper->iSize - iOff);
         if( nRead>512 ) nRead = 512;
-        if( isDb && iOff==PENDING_BYTE ) continue;
         rc = sqlite3OsRead(pReal, &pWrapper->zData[iOff], nRead, iOff);
       }
     }else{