diff --git a/manifest b/manifest
index 173bd4ae6a..d6e1251d4a 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Fix\sa\stypo\sin\sthe\swalmode.test\stest\sscript\sintroducted\syesterday.
-D 2010-05-01T11:33:14
+C Support\scompile-time\soption\sSQLITE_OMIT_WAL,\sfor\sbuilding\swithout\sWAL\ssupport.
+D 2010-05-01T16:40:20
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -112,7 +109,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c e86634da8c48357a759694c9c7c471125cd8d5a8
 F src/bitvec.c 06ad2c36a9c3819c0b9cbffec7b15f58d5d834e0
 F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
-F src/btree.c 2e41e62e80ad4686b3322721982ceb7aa6d8c9f1
+F src/btree.c d0414a5f09b0cacb64bd60b91c5a3720585925aa
 F src/btree.h dd83041eda10c17daf023257c1fc883b5f71f85a
 F src/btreeInt.h b0c87f6725b06a0aa194a6d25d54b16ce9d6e291
 F src/build.c 11100b66fb97638d2d874c1d34d8db90650bb1d7
@@ -134,7 +131,7 @@ F src/journal.c b0ea6b70b532961118ab70301c00a33089f9315c
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581
-F src/main.c 28171059466a5dac18160c466b978eaafdbb3594
+F src/main.c b672c4af58f033c54398999dec5db9d4b6d99331
 F src/malloc.c a08f16d134f0bfab6b20c3cd142ebf3e58235a6a
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2
@@ -153,15 +150,15 @@ F src/os.c 8bc63cf91e9802e2b807198e54e50227fa889306
 F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c
 F src/os_common.h 0d6ee583b6ee3185eb9d951f890c6dd03021a08d
 F src/os_os2.c 8ad77a418630d7dee91d1bb04f79c2096301d3a0
-F src/os_unix.c 559f9f18ccd85a6d8da0309753f4be124998bddf
+F src/os_unix.c 27ec47f27987b9f25bc55df5e458f7f380730f66
 F src/os_win.c a8fc01d8483be472e495793c01064fd87e56a5c1
-F src/pager.c 434f9751fc2dfc11ade004282deda5f8560bcba2
+F src/pager.c e9c7fe979b32a3c5bf4216d8fbe1cf8beff8a1b8
 F src/pager.h 934b598583a9d936bb13c37d62a2fe68ac48781c
 F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c ace8f6a5ecd4711cc66a1b23053be7109bd437cf
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
 F src/pcache1.c 6dc1871ce8ead9187161c370a58cd06c84221f76
-F src/pragma.c 5ba364af022d9dbdfb39daf4fd26cbf26571fc0e
+F src/pragma.c 3d4ba9c35438b296360dc09ebf86c417cf996667
 F src/prepare.c fd1398cb1da54385ba5bd68d93928f10d10a1d9c
 F src/printf.c 5f5b65a83e63f2096a541a340722a509fa0240a7
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
@@ -171,7 +168,7 @@ F src/select.c c03d8a0565febcde8c6a12c5d77d065fddae889b
 F src/shell.c c40427c7245535a04a9cb4a417b6cc05c022e6a4
 F src/sqlite.h.in 6e91727c0c3f9e1365e8fea2b07369a09830f47f
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
-F src/sqliteInt.h 32dfe6294b46914fb567db493994bf902fb0f8c9
+F src/sqliteInt.h 3eb613c8ba7f5159be0acf3fc148d41ec49add86
 F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
 F src/status.c 4df6fe7dce2d256130b905847c6c60055882bdbe
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -189,7 +186,7 @@ F src/test_async.c c1656facbaf43cb2e71b62621e5b9eb080e2621c
 F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
 F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
-F src/test_config.c 8c408fbffbe8082d1d3dc55044ddfd5580f3c9b9
+F src/test_config.c 6210f501d358bde619ae761f06f123529c6ba24f
 F src/test_demovfs.c da81a5f7785bb352bda7911c332a983ec4f17f27
 F src/test_devsym.c c05024cd179603181cde66d0ff83ce81e146f6de
 F src/test_func.c 13b582345fb1185a93e46c53310fae8547dcce20
@@ -215,17 +212,17 @@ F src/update.c c0dc6b75ad28b76b619042d934f337b02acee208
 F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
 F src/util.c 32aebf04c10e51ad3977a928b7416bed671b620b
 F src/vacuum.c 8e7d9a6fd076774bb6e211cad335c7337948a164
-F src/vdbe.c 2a5ccf3a760498d16ff3869162d3422f165bfb1d
+F src/vdbe.c b2e2b70e9518c6cc986e74eca99607700904f4bd
 F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
 F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1
-F src/vdbeapi.c 85e448c7d1d6dde7226c721cd8da8f9b5286699d
+F src/vdbeapi.c 810abe698db3ccaf67c5a8982f8cd4f31c6c902f
 F src/vdbeaux.c 395d21a1617553ea9b9f4abe0d302449d8549e1d
 F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c 2115a90d42e1cc14c0f196677609f6c9b32afec7
-F src/wal.h c3f347ba8f1cde46d9bcc6fedaf3ed0aa4b53294
+F src/wal.c 4a9b7fb028059992dfe51d23f0ced78064459c84
+F src/wal.h d6d4a6809151e30bed5b01dd05cf27858f5a7bc8
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -308,7 +305,7 @@ F test/corrupt6.test e69b877d478224deab7b66844566258cecacd25e
 F test/corrupt7.test 1eb2214f29474fa6b155aa3da8a7d46bf52089e1
 F test/corrupt8.test 9992ef7f67cefc576b92373f6bf5ab8775280f51
 F test/corrupt9.test 4aa1cb1ef091cb0e13e89a819c72911631b5176a
-F test/corruptA.test a2fb8d8037e5105d21dc094c3ef44864934325dd
+F test/corruptA.test 38b4f81c16099f6d8fa8b37e188fde76b8243994
 F test/corruptB.test d88b500f7994cb2eb9646410c263111e9831f889
 F test/corruptC.test 691ed070baef5e1345939caadf270a52837a5064
 F test/corruptD.test 3ae6e2dc6e2226c6935a8a40d4b5ee3eba75f8c0
@@ -545,7 +542,7 @@ F test/quick.test 6f202befe1cfae0b63df96b3120a8022ab11f574
 F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
 F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
 F test/randexpr1.test 1084050991e9ba22c1c10edd8d84673b501cc25a
-F test/rdonly.test 329558d8f3f7679e7e00f5f1d7cdd5dde78ba382
+F test/rdonly.test c243623b26c311faab2aee311a26af372e123a65
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/rollback.test 73355ad4492ff9a3a31e61c7e5eb5e01a1de94ca
 F test/rowhash.test 97f56043ba11f0679920416c0cdbc72e5272267b
@@ -761,13 +758,13 @@ F test/vtabE.test 7c4693638d7797ce2eda17af74292b97e705cc61
 F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
-F test/wal.test 830fc2d723fc4c55ef5666141e3a54e0cedd87e5
-F test/walbak.test f6fde9a5f59d0c697cb1f4af7876178c2f69a7ba
-F test/walcrash.test f022cee7eb7baa5fb898726120a6a4073dd831d1
-F test/walhook.test 287a69d662939604f2e0452dace2cec8ef634d5e
-F test/walmode.test 3150edf5e2b36afebc3c6f0dd63b76f91485ac4a
-F test/walslow.test 38076d5fad49e3678027be0f8110e6a32d531dc2
-F test/walthread.test 896b2377145e32fab024677d68f609df2f6e9bc6
+F test/wal.test 4ff92f36495142420ce8c2bb45340dcad714a1e5
+F test/walbak.test fad10a10df78ab67e89a8779ddc3c0d230460693
+F test/walcrash.test 20ebd86c0ea1bfdec97987c3cf667118f5c74a84
+F test/walhook.test 5ee5fd35cdc3763d5674da0dd9974f6f70c07bed
+F test/walmode.test bac6f06544a8554588a1543def996bbe2fc41792
+F test/walslow.test 9be52d033e871cb608a18fa4425a6dc64b625377
+F test/walthread.test 16559527eb1f1a6e9eff21cc92f7fa51fb0b5a32
 F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
 F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
 F test/where3.test aa44a9b29e8c9f3d7bb94a3bb3a95b31627d520d
@@ -811,14 +808,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 64840a3caf569959c9d5e63bdbc0cf675fda3882
-R 21a564c0ac84f284e21a69521a141263
-U drh
-Z b4b7a879c871fd7cac60b2970ea4e35c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFL3BF9oxKgR168RlERApFnAJ9WZITqlHLHOJRSxljsAEpGgWWkPwCeKmEF
-oOhtURrWyUmr8iL/+kUvfZU=
-=vngs
------END PGP SIGNATURE-----
+P dcabc90ca588281fa7a290972ec8af6816932489
+R e813455665cf7f3ad3b5157515fc2fe7
+U dan
+Z 955de6008d5a15476ae5c3900eb59d71
diff --git a/manifest.uuid b/manifest.uuid
index 31a1f9b724..c4a52f55ba 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dcabc90ca588281fa7a290972ec8af6816932489
\ No newline at end of file
+9b230c43dfa112e3e1589f9775926807bd36b36e
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index e60754e582..eace01fff1 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -2261,6 +2261,15 @@ static int lockBtree(BtShared *pBt){
     if( memcmp(page1, zMagicHeader, 16)!=0 ){
       goto page1_init_failed;
     }
+
+#ifdef SQLITE_OMIT_WAL
+    if( page1[18]>1 ){
+      pBt->readOnly = 1;
+    }
+    if( page1[19]>1 ){
+      goto page1_init_failed;
+    }
+#else
     if( page1[18]>2 ){
       pBt->readOnly = 1;
     }
@@ -2287,6 +2296,7 @@ static int lockBtree(BtShared *pBt){
       }
       rc = SQLITE_NOTADB;
     }
+#endif
 
     /* The maximum embedded fraction must be exactly 25%.  And the minimum
     ** embedded fraction must be 12.5% for both leaf-data and non-leaf-data.
diff --git a/src/main.c b/src/main.c
index c723a4ef55..57ea9736a3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1195,6 +1195,7 @@ void *sqlite3_wal_hook(
   int(*xCallback)(void *, sqlite3*, const char*, int),
   void *pArg                      /* First argument passed to xCallback() */
 ){
+#ifndef SQLITE_OMIT_WAL
   void *pRet;
   sqlite3_mutex_enter(db->mutex);
   pRet = db->pWalArg;
@@ -1202,6 +1203,9 @@ void *sqlite3_wal_hook(
   db->pWalArg = pArg;
   sqlite3_mutex_leave(db->mutex);
   return pRet;
+#else
+  return 0;
+#endif
 }
 
 /*
diff --git a/src/os_unix.c b/src/os_unix.c
index f37afa1f14..b2c22c3652 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4562,6 +4562,8 @@ static int unixGetLastError(sqlite3_vfs *NotUsed, int NotUsed2, char *NotUsed3){
   return 0;
 }
 
+#ifndef SQLITE_OMIT_WAL
+
 /* Forward reference */
 typedef struct unixShm unixShm;
 typedef struct unixShmFile unixShmFile;
@@ -5334,6 +5336,15 @@ static int unixShmDelete(sqlite3_vfs *pVfs, const char *zName){
   return pVfs->xDelete(pVfs, zName, 0);
 }
 
+#else
+# define unixShmOpen    0
+# define unixShmSize    0
+# define unixShmGet     0
+# define unixShmRelease 0
+# define unixShmLock    0
+# define unixShmClose   0
+# define unixShmDelete  0
+#endif /* #ifndef SQLITE_OMIT_WAL */
 
 /*
 ************************ End of sqlite3_vfs methods ***************************
diff --git a/src/pager.c b/src/pager.c
index ee0c575a59..00d07caff0 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -399,7 +399,9 @@ struct Pager {
   char *pTmpSpace;            /* Pager.pageSize bytes of space for tmp use */
   PCache *pPCache;            /* Pointer to page cache object */
   sqlite3_backup *pBackup;    /* Pointer to list of ongoing backup processes */
+#ifndef SQLITE_OMIT_WAL
   Wal *pWal;                  /* Write-ahead log used by "journal_mode=wal" */
+#endif
 };
 
 /*
@@ -1192,9 +1194,16 @@ static int addToSavepointBitvecs(Pager *pPager, Pgno pgno){
 ** Return true if this pager uses a write-ahead log instead of the usual
 ** rollback journal. Otherwise false.
 */
+#ifndef SQLITE_OMIT_WAL
 static int pagerUseWal(Pager *pPager){
   return (pPager->pWal!=0);
 }
+#else
+# define pagerUseWal(x) 0
+# define pagerRollbackWal(x) 0
+# define pagerWalFrames(v,w,x,y,z) 0
+# define pagerOpenWalIfPresent(z) SQLITE_OK
+#endif
 
 /*
 ** Unlock the database file. This function is a no-op if the pager
@@ -2242,6 +2251,7 @@ static int readDbPage(PgHdr *pPg){
   return rc;
 }
 
+#ifndef SQLITE_OMIT_WAL
 /*
 ** This function is invoked once for each page that has already been 
 ** written into the log file when a WAL transaction is rolled back.
@@ -2311,6 +2321,115 @@ static int pagerRollbackWal(Pager *pPager){
   return rc;
 }
 
+/*
+** This function is a wrapper around sqlite3WalFrames(). As well as logging
+** the contents of the list of pages headed by pList (connected by pDirty),
+** this function notifies any active backup processes that the pages have
+** changed. 
+*/ 
+static int pagerWalFrames(
+  Pager *pPager,                  /* Pager object */
+  PgHdr *pList,                   /* List of frames to log */
+  Pgno nTruncate,                 /* Database size after this commit */
+  int isCommit,                   /* True if this is a commit */
+  int sync_flags                  /* Flags to pass to OsSync() (or 0) */
+){
+  int rc;                         /* Return code */
+
+  assert( pPager->pWal );
+  rc = sqlite3WalFrames(pPager->pWal, 
+      pPager->pageSize, pList, nTruncate, isCommit, sync_flags
+  );
+  if( rc==SQLITE_OK && pPager->pBackup ){
+    PgHdr *p;
+    for(p=pList; p; p=p->pDirty){
+      sqlite3BackupUpdate(pPager->pBackup, p->pgno, (u8 *)p->pData);
+    }
+  }
+  return rc;
+}
+
+/*
+** Open a WAL snapshot on the log file this pager is connected to.
+*/
+static int pagerOpenSnapshot(Pager *pPager){
+  int rc;                         /* Return code */
+  int changed = 0;                /* True if cache must be reset */
+
+  assert( pagerUseWal(pPager) );
+
+  rc = sqlite3WalOpenSnapshot(pPager->pWal, &changed);
+  if( rc==SQLITE_OK ){
+    int dummy;
+    if( changed ){
+      pager_reset(pPager);
+      assert( pPager->errCode || pPager->dbSizeValid==0 );
+    }
+    rc = sqlite3PagerPagecount(pPager, &dummy);
+  }
+  pPager->state = PAGER_SHARED;
+
+  return rc;
+}
+
+/*
+** Check if the *-wal file that corresponds to the database opened by pPager
+** exists. Assuming no error occurs, set *pExists to 1 if the file exists,
+** or 0 otherwise and return SQLITE_OK. If an IO or OOM error occurs, return
+** an SQLite error code.
+*/
+static int pagerHasWAL(Pager *pPager, int *pExists){
+  int rc;                         /* Return code */
+
+  if( !pPager->tempFile ){
+    char *zWal = sqlite3_mprintf("%s-wal", pPager->zFilename);
+    if( !zWal ){
+      rc = SQLITE_NOMEM;
+    }else{
+      rc = sqlite3OsAccess(pPager->pVfs, zWal, SQLITE_ACCESS_EXISTS, pExists);
+      sqlite3_free(zWal);
+    }
+  }else{
+    rc = SQLITE_OK;
+    *pExists = 0;
+  }
+  return rc;
+}
+
+/*
+** Check if the *-wal file that corresponds to the database opened by pPager
+** exists. If it does, open the pager in WAL mode. Otherwise, if no error
+** occurs, make sure Pager.journalMode is not set to PAGER_JOURNALMODE_WAL.
+** If an IO or OOM error occurs, return an SQLite error code.
+**
+** If the WAL file is opened, also open a snapshot (read transaction).
+**
+** The caller must hold a SHARED lock on the database file to call this
+** function. Because an EXCLUSIVE lock on the db file is required to delete 
+** a WAL, this ensures there is no race condition between the xAccess() 
+** below and an xDelete() being executed by some other connection.
+*/
+static int pagerOpenWalIfPresent(Pager *pPager){
+  int rc = SQLITE_OK;
+  if( !pPager->tempFile ){
+    int isWal;                    /* True if WAL file exists */
+    rc = pagerHasWAL(pPager, &isWal);
+    if( rc==SQLITE_OK ){
+      if( isWal ){
+        pager_reset(pPager);
+        rc = sqlite3PagerOpenWal(pPager, 0);
+        if( rc==SQLITE_OK ){
+          rc = pagerOpenSnapshot(pPager);
+        }
+      }else if( pPager->journalMode==PAGER_JOURNALMODE_WAL ){
+        pPager->journalMode = PAGER_JOURNALMODE_DELETE;
+      }
+    }
+  }
+  return rc;
+}
+#endif
+
 /*
 ** Playback savepoint pSavepoint. Or, if pSavepoint==NULL, then playback
 ** the entire master journal file. The case pSavepoint==NULL occurs when 
@@ -2934,10 +3053,12 @@ int sqlite3PagerClose(Pager *pPager){
   sqlite3BeginBenignMalloc();
   pPager->errCode = 0;
   pPager->exclusiveMode = 0;
+#ifndef SQLITE_OMIT_WAL
   sqlite3WalClose(pPager->pWal, pPager->fd, 
     (pPager->noSync ? 0 : pPager->sync_flags), pTmp
   );
   pPager->pWal = 0;
+#endif
   pager_reset(pPager);
   if( MEMDB ){
     pager_unlock(pPager);
@@ -3280,34 +3401,6 @@ static int subjournalPage(PgHdr *pPg){
   return rc;
 }
 
-/*
-** This function is a wrapper around sqlite3WalFrames(). As well as logging
-** the contents of the list of pages headed by pList (connected by pDirty),
-** this function notifies any active backup processes that the pages have
-** changed. 
-*/ 
-static int pagerWalFrames(
-  Pager *pPager,                  /* Pager object */
-  PgHdr *pList,                   /* List of frames to log */
-  Pgno nTruncate,                 /* Database size after this commit */
-  int isCommit,                   /* True if this is a commit */
-  int sync_flags                  /* Flags to pass to OsSync() (or 0) */
-){
-  int rc;                         /* Return code */
-
-  assert( pPager->pWal );
-  rc = sqlite3WalFrames(pPager->pWal, 
-      pPager->pageSize, pList, nTruncate, isCommit, sync_flags
-  );
-  if( rc==SQLITE_OK && pPager->pBackup ){
-    PgHdr *p;
-    for(p=pList; p; p=p->pDirty){
-      sqlite3BackupUpdate(pPager->pBackup, p->pgno, (u8 *)p->pData);
-    }
-  }
-  return rc;
-}
-
 /*
 ** This function is called by the pcache layer when it has reached some
 ** soft memory limit. The first argument is a pointer to a Pager object
@@ -3819,55 +3912,6 @@ static int hasHotJournal(Pager *pPager, int *pExists){
   return rc;
 }
 
-/*
-** Check if the *-wal file that corresponds to the database opened by pPager
-** exists. Assuming no error occurs, set *pExists to 1 if the file exists,
-** or 0 otherwise and return SQLITE_OK. If an IO or OOM error occurs, return
-** an SQLite error code.
-**
-** The caller must hold a SHARED lock on the database file to call this
-** function. Because an EXCLUSIVE lock on the db file is required to delete 
-** a WAL, this ensures there is no race condition between the xAccess() 
-** below and an xDelete() being executed by some other connection.
-*/
-static int pagerHasWAL(Pager *pPager, int *pExists){
-  int rc;                         /* Return code */
-
-  if( !pPager->tempFile ){
-    char *zWal = sqlite3_mprintf("%s-wal", pPager->zFilename);
-    if( !zWal ){
-      rc = SQLITE_NOMEM;
-    }else{
-      rc = sqlite3OsAccess(pPager->pVfs, zWal, SQLITE_ACCESS_EXISTS, pExists);
-      sqlite3_free(zWal);
-    }
-  }else{
-    rc = SQLITE_OK;
-    *pExists = 0;
-  }
-  return rc;
-}
-
-static int pagerOpenSnapshot(Pager *pPager){
-  int rc;                         /* Return code */
-  int changed = 0;                /* True if cache must be reset */
-
-  assert( pagerUseWal(pPager) );
-
-  rc = sqlite3WalOpenSnapshot(pPager->pWal, &changed);
-  if( rc==SQLITE_OK ){
-    int dummy;
-    if( changed ){
-      pager_reset(pPager);
-      assert( pPager->errCode || pPager->dbSizeValid==0 );
-    }
-    rc = sqlite3PagerPagecount(pPager, &dummy);
-  }
-  pPager->state = PAGER_SHARED;
-
-  return rc;
-}
-
 /*
 ** This function is called to obtain a shared lock on the database file.
 ** It is illegal to call sqlite3PagerAcquire() until after this function
@@ -3926,7 +3970,6 @@ int sqlite3PagerSharedLock(Pager *pPager){
   }else if( pPager->state==PAGER_UNLOCK || isErrorReset ){
     sqlite3_vfs * const pVfs = pPager->pVfs;
     int isHotJournal = 0;
-    int isWal = 0;
     assert( !MEMDB );
     assert( sqlite3PcacheRefCount(pPager->pPCache)==0 );
     if( pPager->noReadlock ){
@@ -4081,19 +4124,10 @@ int sqlite3PagerSharedLock(Pager *pPager){
     }
     assert( pPager->exclusiveMode || pPager->state==PAGER_SHARED );
 
-    rc = pagerHasWAL(pPager, &isWal);
-    if( rc!=SQLITE_OK ){
-      goto failed;
-    }
-    if( isWal ){
-      pager_reset(pPager);
-      rc = sqlite3PagerOpenWal(pPager, 0);
-      if( rc==SQLITE_OK ){
-        rc = pagerOpenSnapshot(pPager);
-      }
-    }else if( pPager->journalMode==PAGER_JOURNALMODE_WAL ){
-      pPager->journalMode = PAGER_JOURNALMODE_DELETE;
-    }
+    /* If there is a WAL file in the file-system, open this database in WAL
+    ** mode. Otherwise, the following function call is a no-op.
+    */
+    rc = pagerOpenWalIfPresent(pPager);
   }
 
  failed:
@@ -5789,6 +5823,7 @@ sqlite3_backup **sqlite3PagerBackupPtr(Pager *pPager){
   return &pPager->pBackup;
 }
 
+#ifndef SQLITE_OMIT_WAL
 /*
 ** This function is called when the user invokes "PRAGMA checkpoint".
 */
@@ -5836,7 +5871,6 @@ int sqlite3PagerOpenWal(Pager *pPager, int *pisOpen){
   return rc;
 }
 
-
 /*
 ** This function is called to close the connection to the log file prior
 ** to switching from WAL to rollback mode.
@@ -5881,5 +5915,6 @@ int sqlite3PagerCloseWal(Pager *pPager){
   }
   return rc;
 }
+#endif
 
 #endif /* SQLITE_OMIT_DISKIO */
diff --git a/src/pragma.c b/src/pragma.c
index da6a6807f5..263b7fc0cb 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -265,7 +265,10 @@ static const char *actionName(u8 action){
 */
 const char *sqlite3JournalModename(int eMode){
   static char * const azModeName[] = {
-    "delete", "persist", "off", "truncate", "memory", "wal"
+    "delete", "persist", "off", "truncate", "memory"
+#ifndef SQLITE_OMIT_WAL
+     , "wal"
+#endif
   };
   assert( PAGER_JOURNALMODE_DELETE==0 );
   assert( PAGER_JOURNALMODE_PERSIST==1 );
@@ -1397,10 +1400,17 @@ void sqlite3Pragma(
   }else
 #endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */
 
+#ifndef SQLITE_OMIT_WAL
+  /*
+  **   PRAGMA [database.]checkpoint
+  **
+  ** Checkpoint the database.
+  */
   if( sqlite3StrICmp(zLeft, "checkpoint")==0 ){
     sqlite3VdbeUsesBtree(v, iDb);
     sqlite3VdbeAddOp3(v, OP_Checkpoint, iDb, 0, 0);
   }else
+#endif
 
 #if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
   /*
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 54effce127..28268104ca 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -823,8 +823,10 @@ struct sqlite3 {
   void (*xRollbackCallback)(void*); /* Invoked at every commit. */
   void *pUpdateArg;
   void (*xUpdateCallback)(void*,int, const char*,const char*,sqlite_int64);
+#ifndef SQLITE_OMIT_WAL
   int (*xWalCallback)(void *, sqlite3 *, const char *, int);
   void *pWalArg;
+#endif
   void(*xCollNeeded)(void*,sqlite3*,int eTextRep,const char*);
   void(*xCollNeeded16)(void*,sqlite3*,int eTextRep,const void*);
   void *pCollNeededArg;
diff --git a/src/test_config.c b/src/test_config.c
index 8544ee5356..092d6a2228 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -499,6 +499,12 @@ Tcl_SetVar2(interp, "sqlite_options", "long_double",
   Tcl_SetVar2(interp, "sqlite_options", "vtab", "1", TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_OMIT_WAL
+  Tcl_SetVar2(interp, "sqlite_options", "wal", "0", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "wal", "1", TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_OMIT_WSD
   Tcl_SetVar2(interp, "sqlite_options", "wsd", "0", TCL_GLOBAL_ONLY);
 #else
diff --git a/src/vdbe.c b/src/vdbe.c
index c6a38c5ba6..c040fb8d2e 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -5186,6 +5186,7 @@ case OP_AggFinal: {
   break;
 }
 
+#ifndef SQLITE_OMIT_WAL
 /* Opcode: Checkpoint P1 * * * *
 **
 ** Checkpoint database P1. This is a no-op if P1 is not currently in
@@ -5200,6 +5201,7 @@ case OP_Checkpoint: {
   rc = sqlite3PagerCheckpoint(sqlite3BtreePager(pBt));
   break;
 };  
+#endif
 
 /* Opcode: JournalMode P1 P2 P3 * *
 **
@@ -5234,6 +5236,8 @@ case OP_JournalMode: {    /* out2-prerelease */
 
   pBt = db->aDb[pOp->p1].pBt;
   pPager = sqlite3BtreePager(pBt);
+
+#ifndef SQLITE_OMIT_WAL
   zFilename = sqlite3PagerFilename(pPager);
   pVfs = sqlite3PagerVfs(pPager);
 
@@ -5282,6 +5286,7 @@ case OP_JournalMode: {    /* out2-prerelease */
       }
     }
   }
+#endif /* ifndef SQLITE_OMIT_WAL */
 
   eNew = sqlite3PagerJournalMode(pPager, eNew);
   pOut = &aMem[pOp->p2];
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 12100ce56b..5aec7ca0f6 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -306,9 +306,14 @@ void sqlite3_result_error_nomem(sqlite3_context *pCtx){
   pCtx->s.db->mallocFailed = 1;
 }
 
+/*
+** This function is called after a transaction has been committed. It 
+** invokes callbacks registered with sqlite3_wal_hook() as required.
+*/
 static int doWalCallbacks(sqlite3 *db){
-  int i;
   int rc = SQLITE_OK;
+#ifndef SQLITE_OMIT_WAL
+  int i;
   for(i=0; i<db->nDb; i++){
     Btree *pBt = db->aDb[i].pBt;
     if( pBt ){
@@ -320,6 +325,7 @@ static int doWalCallbacks(sqlite3 *db){
       }
     }
   }
+#endif
   return rc;
 }
 
diff --git a/src/wal.c b/src/wal.c
index d406383a28..146675ad6b 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -13,6 +13,8 @@
 ** This file contains the implementation of a write-ahead log file used in 
 ** "journal_mode=wal" mode.
 */
+#ifndef SQLITE_OMIT_WAL
+
 #include "wal.h"
 
 
@@ -1271,6 +1273,7 @@ int sqlite3WalCheckpoint(
   int isChanged = 0;              /* True if a new wal-index header is loaded */
 
   assert( pWal->lockState==SQLITE_SHM_UNLOCK );
+  assert( pWal->pWiData==0 );
 
   /* Get the CHECKPOINT lock */
   do {
@@ -1315,3 +1318,4 @@ int sqlite3WalCallback(Wal *pWal){
   }
   return (int)ret;
 }
+#endif /* #ifndef SQLITE_OMIT_WAL */
diff --git a/src/wal.h b/src/wal.h
index 1c787d8dcd..fde28d4799 100644
--- a/src/wal.h
+++ b/src/wal.h
@@ -19,6 +19,22 @@
 
 #include "sqliteInt.h"
 
+#ifdef SQLITE_OMIT_WAL
+# define sqlite3WalOpen(x,y,z)             0
+# define sqlite3WalClose(w,x,y,z)          0
+# define sqlite3WalOpenSnapshot(y,z)       0
+# define sqlite3WalCloseSnapshot(z) 
+# define sqlite3WalRead(w,x,y,z)           0
+# define sqlite3WalDbsize(y,z)
+# define sqlite3WalWriteLock(y,z)          0
+# define sqlite3WalUndo(x,y,z)             0
+# define sqlite3WalSavepoint(z)            0
+# define sqlite3WalSavepointUndo(y,z)      0
+# define sqlite3WalFrames(u,v,w,x,y,z)     0
+# define sqlite3WalCheckpoint(u,v,w,x,y,z) 0
+# define sqlite3WalCallback(z)             0
+#else
+
 /* Connection to a write-ahead log (WAL) file. 
 ** There is one object of this type for each pager. 
 */
@@ -79,4 +95,5 @@ int sqlite3WalCheckpoint(
 */
 int sqlite3WalCallback(Wal *pWal);
 
+#endif /* ifndef SQLITE_OMIT_WAL */
 #endif /* _WAL_H_ */
diff --git a/test/corruptA.test b/test/corruptA.test
index 5d5e6f49a2..58e14da1bd 100644
--- a/test/corruptA.test
+++ b/test/corruptA.test
@@ -37,9 +37,11 @@ integrity_check corruptA-1.2
 db close
 file copy -force test.db test.db-template
 
+set unreadable_version 02
+ifcapable wal { set unreadable_version 03 }
 do_test corruptA-2.1 {
   file copy -force test.db-template test.db
-  hexio_write test.db 19 03   ;# the read format number
+  hexio_write test.db 19 $unreadable_version   ;# the read format number
   sqlite3 db test.db
   catchsql {SELECT * FROM t1}  
 } {1 {file is encrypted or is not a database}}
diff --git a/test/rdonly.test b/test/rdonly.test
index cd611aeee5..e363497040 100644
--- a/test/rdonly.test
+++ b/test/rdonly.test
@@ -67,8 +67,10 @@ do_test rdonly-1.5 {
 # write-version is reloaded). This way, SQLite does not discover that
 # the database is read-only until after it is locked.
 #
+set ro_version 02
+ifcapable wal { set ro_version 03 }
 do_test rdonly-1.6 {
-  hexio_write test.db 18 03              ; # write-version
+  hexio_write test.db 18 $ro_version     ; # write-version
   hexio_write test.db 24 11223344        ; # change-counter
   catchsql {
     INSERT INTO t1 VALUES(2);
diff --git a/test/wal.test b/test/wal.test
index 017b47f40e..1f032cac32 100644
--- a/test/wal.test
+++ b/test/wal.test
@@ -17,6 +17,8 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 source $testdir/lock_common.tcl
 
+ifcapable !wal {finish_test ; return }
+
 proc reopen_db {} {
   catch { db close }
   file delete -force test.db test.db-wal test.db-wal-summary
diff --git a/test/walbak.test b/test/walbak.test
index 11a7040cdc..4028aa4d56 100644
--- a/test/walbak.test
+++ b/test/walbak.test
@@ -16,6 +16,8 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !wal {finish_test ; return }
+
 proc log_file_size {nFrame pgsz} {
   expr {12 + ($pgsz+16)*$nFrame}
 }
diff --git a/test/walcrash.test b/test/walcrash.test
index ed2b292861..dc718b0d29 100644
--- a/test/walcrash.test
+++ b/test/walcrash.test
@@ -27,6 +27,8 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+ifcapable !wal {finish_test ; return }
+
 db close
 
 set seed 0
diff --git a/test/walhook.test b/test/walhook.test
index a33b43a005..49f07dda53 100644
--- a/test/walhook.test
+++ b/test/walhook.test
@@ -16,6 +16,8 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !wal {finish_test ; return }
+
 proc sqlite3_wal {args} {
   eval sqlite3 $args
   [lindex $args 0] eval { 
diff --git a/test/walmode.test b/test/walmode.test
index 5b3006cc78..a19a04efc2 100644
--- a/test/walmode.test
+++ b/test/walmode.test
@@ -16,6 +16,25 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+# If the library was compiled without WAL support, check that the 
+# "PRAGMA journal_mode=WAL" treats "WAL" as an unrecognized mode.
+#
+ifcapable !wal {
+
+  do_test walmode-0.1 {
+    execsql { PRAGMA journal_mode = wal }
+  } {delete}
+  do_test walmode-0.2 {
+    execsql { PRAGMA main.journal_mode = wal }
+  } {delete}
+  do_test walmode-0.3 {
+    execsql { PRAGMA main.journal_mode }
+  } {delete}
+
+  finish_test
+  return
+}
+
 do_test walmode-1.1 {
   set sqlite_sync_count 0
   execsql { PRAGMA page_size = 1024 }
diff --git a/test/walslow.test b/test/walslow.test
index 73f93a48df..25e252bbb4 100644
--- a/test/walslow.test
+++ b/test/walslow.test
@@ -17,6 +17,8 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !wal {finish_test ; return }
+
 proc reopen_db {} {
   catch { db close }
   file delete -force test.db test.db-wal
diff --git a/test/walthread.test b/test/walthread.test
index fa42af9c6a..54f3eb4f7d 100644
--- a/test/walthread.test
+++ b/test/walthread.test
@@ -18,6 +18,7 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 source $testdir/lock_common.tcl
 if {[run_thread_tests]==0} { finish_test ; return }
+ifcapable !wal             { finish_test ; return }
 
 set sqlite_walsummary_mmap_incr 64