]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Remove a testcase() macro that would require a 4GiB WAL to reach.
authordrh <drh@noemail.net>
Wed, 7 Jul 2010 14:35:58 +0000 (14:35 +0000)
committerdrh <drh@noemail.net>
Wed, 7 Jul 2010 14:35:58 +0000 (14:35 +0000)
FossilOrigin-Name: 15f9c2713bdfd3d6c8d8d4298f101d128e39b99a

manifest
manifest.uuid
src/wal.c

index 020f4febe34d4889b7eea0a715ca85fd796a359a..97b871de656989f2c08b01d6374699e7d7113260 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\sa\scompiler\swarning\sin\sPRAGMA\sjournal_mode.
-D 2010-07-07T14:33:09
+C Remove\sa\stestcase()\smacro\sthat\swould\srequire\sa\s4GiB\sWAL\sto\sreach.
+D 2010-07-07T14:35:58
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c4270a1cd7cd70a263b7e96a258aa90e9c3618eb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -229,7 +229,7 @@ F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
 F src/vdbemem.c 5e579abf6532001dfbee0e640dc34eae897a9807
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c ad263575206ffe8ed48d1407614354d4746d61bf
+F src/wal.c 950f8d843efa08a9f9e05ed25815262b197bc932
 F src/wal.h 906c85760598b18584921fe08008435aa4eeeeb2
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 926c83c6394e132a1c62b6b12ceeba7d55a34c19
@@ -834,14 +834,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P b3179379437dbcb1d8e7f1f8f631a3e7df1a5c9a
-R 63d7123310953a831ecd91dafe773275
+P d94269e60dbcb50b8a35f142c64ed013cc0045ac
+R 88711d279d3652f0441460db8eabd25c
 U drh
-Z 3728b520ea88514c29608bbf4e49b1f4
+Z ca7b32c7a12c1a4faadf104f2e96e9b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMNJAooxKgR168RlERAkk7AJwKtT3fmVOeS/JebTj8uqMZeUXOrACeI6WH
-7rgZnrDOtF+4DmQygPlG3Bc=
-=/iv2
+iD8DBQFMNJDRoxKgR168RlERAg9SAJ9o/wzRHgI3rUAgTWE0fI8QfqgFZwCgjgHM
+b4RJd1ujyUfxDB3jRudAQjk=
+=QBgh
 -----END PGP SIGNATURE-----
index f27a431a70b6bd315734583b218a064fdc1b5418..338bc63dde964aa7e42db7c15a77c44053b20639 100644 (file)
@@ -1 +1 @@
-d94269e60dbcb50b8a35f142c64ed013cc0045ac
\ No newline at end of file
+15f9c2713bdfd3d6c8d8d4298f101d128e39b99a
\ No newline at end of file
index b87186b7354c57aa7398e03cd7cf527b1b5bedbf..525138682f6d6511416ce8f458a1793eef050d80 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -1576,7 +1576,7 @@ static int walCheckpoint(
       assert( walFramePgno(pWal, iFrame)==iDbpage );
       if( iFrame<=nBackfill || iFrame>mxSafeFrame ) continue;
       iOffset = walFrameOffset(iFrame, szPage) + WAL_FRAME_HDRSIZE;
-      /* testcase( IS_BIG_INT(iOffset) ); -- would require a 4GB WAL file */
+      /* testcase( IS_BIG_INT(iOffset) ); // requires a 4GiB WAL file */
       rc = sqlite3OsRead(pWal->pWalFd, zBuf, szPage, iOffset);
       if( rc!=SQLITE_OK ) break;
       iOffset = (iDbpage-1)*(i64)szPage;
@@ -2128,7 +2128,7 @@ int sqlite3WalRead(
   if( iRead ){
     i64 iOffset = walFrameOffset(iRead, pWal->hdr.szPage) + WAL_FRAME_HDRSIZE;
     *pInWal = 1;
-    testcase( IS_BIG_INT(iOffset) );
+    /* testcase( IS_BIG_INT(iOffset) ); // requires a 4GiB WAL */
     return sqlite3OsRead(pWal->pWalFd, pOut, nOut, iOffset);
   }