A couple simple fixes to get wal.test mostly working.

FossilOrigin-Name: c74458127468f30b16715594c8d68e9d3c05d292

diff --git a/manifest b/manifest
index e8b35b9920f003ba56f147cd323eacc98ad38d35..455726248b41eed40778943bf97ca349824e5def 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Refactoring\sthe\sVFS-SHM\smethods\sused\sby\sWAL.\s\sThis\sversion\scompiles\sand\nruns\snon-WAL\stest\scases\sbut\scrashes\sand\sburns\son\swal.test.
-D 2010-05-12T18:01:40
+C A\scouple\ssimple\sfixes\sto\sget\swal.test\smostly\sworking.
+D 2010-05-12T18:10:52
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -227,7 +227,7 @@ F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c 5f52f5ea690e1d542e094ca8c83bea43c2f7ad96
+F src/wal.c c66ba0b722297df063fe84edb4193ef2b05d20d0
 F src/wal.h 434f76f51225bb614e43ccb6bd2341541ba6a06e
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
@@ -817,18 +817,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 7838163d087780a6fb403a17641b96f71baec088
-R 6b207856113b77baacd412d73fab162a
-T *bgcolor * #c0ffc0
-T *branch * wal-refactor
-T *sym-wal-refactor *
-T -sym-trunk *
+P 2b00152c1ac0b3735aa6cfab61259ff04d81c701
+R b7946fb277db4dbc4bc013e5e5fa093c
 U drh
-Z 917cc375618b87c5f919c29d2da7a2ff
+Z 62e42baf1876f9498d88e14692278875
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFL6u0HoxKgR168RlERAnOPAJ9UCbogkeIyu/LrQqmeBg4rRTUaswCdFBEg
-ymzYvEeQKLujVf/zBF2BuxA=
-=vRvp
+iD8DBQFL6u8uoxKgR168RlERAoSbAJ9jNFTVpnB+tvn+mLuDe10PoEq3+ACeI55J
+3VWwGaEkCHFZz1L5A8JAA68=
+=qjYf
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 9b7eec0bebc1be0eda887649feb246cd5c45d5c9..62c6d71cbfe71ce81ff3d7fda01710e53129efa6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2b00152c1ac0b3735aa6cfab61259ff04d81c701
\ No newline at end of file
+c74458127468f30b16715594c8d68e9d3c05d292
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index 0b2c3ceb660d036dca10d9504c601e41e186f8c6..3c99d039eec414c15212be551fd568ed3b87e0fd 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -224,7 +224,7 @@ static int walSetLock(Wal *pWal, int desiredStatus){
     pWal->lockState = desiredStatus;
   }else{
     int got = pWal->lockState;
-    rc = sqlite3OsShmLock(pWal->pWalFd, desiredStatus, &got);
+    rc = sqlite3OsShmLock(pWal->pDbFd, desiredStatus, &got);
     pWal->lockState = got;
     if( got==SQLITE_SHM_READ_FULL || got==SQLITE_SHM_READ ){
       pWal->readerType = got;
@@ -690,7 +690,7 @@ int sqlite3WalOpen(
 
   /* Allocate an instance of struct Wal to return. */
   *ppWal = 0;
-  nWal = sqlite3Strlen30(zWal) + 5;
+  nWal = sqlite3Strlen30(zDbName) + 5;
   pRet = (Wal*)sqlite3MallocZero(sizeof(Wal) + pVfs->szOsFile + nWal);
   if( !pRet ){
     return SQLITE_NOMEM;