Fix an assert() so that it works correctly with SQLITE_TEMP_STORE=3. (CVS 6167)

FossilOrigin-Name: fd2bbcf8d8d03eecd4614636ae787331a8e99816

diff --git a/manifest b/manifest
index 146df8d296623366b5cb6399167628cab1428546..b050eff143b436a9f5701f700475ec5b2a684932 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sjrnlmode.test\sso\sthat\sit\sdoes\snot\srun\stests\sinvolving\sin-memory\sjournals\sduring\sthe\s"journaltest"\spermutation.\s(CVS\s6166)
-D 2009-01-11T05:54:40
+C Fix\san\sassert()\sso\sthat\sit\sworks\scorrectly\swith\sSQLITE_TEMP_STORE=3.\s(CVS\s6167)
+D 2009-01-11T17:00:02
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 05461a9b5803d5ad10c79f989801e9fd2cc3e592
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -142,7 +142,7 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c 7825c6178597713382d74adbf8c8c00ffcdc42d4
 F src/os_win.c 496e3ceb499aedc63622a89ef76f7af2dd902709
-F src/pager.c f53ff4e74071cd99a8a1af55712886b82910d0e2
+F src/pager.c 34fb9317f73bec079310e7618f2d1bedcc0ac93d
 F src/pager.h 9870acb2d653848d90d765d7cbf163496d6c8111
 F src/parse.y 4d0e33a702dc3ea7b69d8ae1914b3fbd32e46057
 F src/pcache.c 16dc8da6e6ba6250f8dfd9ee46036db1cbceedc6
@@ -696,7 +696,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 3538d2a981c5abfe2f88aec75175ae33475e6bcb
-R 4459dabcc4e78672bb21a712abcaf430
-U danielk1977
-Z f400556842edfa7ff5eb0722c1cbc7ba
+P b47ddefc772ee59aa1509ab8d8f229a3d7c4ddaf
+R d5937cb2acc47d8139e1777588aaffe4
+U drh
+Z 0588db20fee627d922c3ef65642c6bea

diff --git a/manifest.uuid b/manifest.uuid
index 44b1286732a753472ace323d04e64fbe3bf4901c..51da921e7bc9788534dd40b4defa6b3d70db2630 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b47ddefc772ee59aa1509ab8d8f229a3d7c4ddaf
\ No newline at end of file
+fd2bbcf8d8d03eecd4614636ae787331a8e99816
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index f17a0ef15a42ef1eedb954a55f33d988d80c7e1a..77a55c77fe1cc56d113b96e663ec2e9bdfa668c6 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.547 2009/01/10 17:57:49 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.548 2009/01/11 17:00:02 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -4168,8 +4168,10 @@ int sqlite3PagerOpenSavepoint(Pager *pPager, int nSavepoint){
     int ii;
     PagerSavepoint *aNew;
 
-    /* Either the sub-journal is open or there are no active savepoints. */
-    assert( pPager->nSavepoint==0 || pPager->sjfd->pMethods );
+    /* Either there is no active journal or the sub-journal is open or 
+    ** the journal is always stored in memory */
+    assert( pPager->nSavepoint==0 || pPager->sjfd->pMethods ||
+            pPager->journalMode==PAGER_JOURNALMODE_MEMORY );
 
     /* Grow the Pager.aSavepoint array using realloc(). Return SQLITE_NOMEM
     ** if the allocation fails. Otherwise, zero the new portion in case a