/ Check-in [79693f04]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix problems with the "inmemory_journal" permutation.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 79693f0412ffb0486b974ee6c63b4231cfff5a77
User & Date: dan 2014-12-30 18:07:34
Context
2014-12-30
19:26
Update the threadtest3 test program so that its output summary is compatible with releasetest.tcl. In threadtest3, do not record errors that contain the string "no such table" as being fatal errors, since they happen sometimes in a race condition in stress1. check-in: 98cb56e2 user: drh tags: trunk
18:07
Fix problems with the "inmemory_journal" permutation. check-in: 79693f04 user: dan tags: trunk
14:40
If the sorter uses mmap'd temp files, ensure all pages of the temp file have been allocated before it is accessed. Otherwise, a disk-full condition might result in a SIGBUS exception. check-in: 77664841 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/permutations.test.

   686    686   
   687    687     # Exclude stmt.test, which expects sub-journals to use temporary files.
   688    688     stmt.test
   689    689   
   690    690     zerodamage.test
   691    691   
   692    692     # WAL mode is different.
   693         -  wal* tkt-2d1a5c67d.test backcompat.test
          693  +  wal* tkt-2d1a5c67d.test backcompat.test e_wal*
   694    694   }]
   695    695   
   696    696   ifcapable mem3 {
   697    697     test_suite "memsys3" -description {
   698    698       Run tests using the allocator in mem3.c.
   699    699     } -files [test_set $::allquicktests -exclude {
   700    700       autovacuum.test           delete3.test              manydb.test

Changes to test/pragma3.test.

   212    212     db2 close
   213    213     db close
   214    214     sqlite3_enable_shared_cache $::enable_shared_cache
   215    215   }
   216    216   
   217    217   # Make sure this also works in WAL mode
   218    218   #
          219  +# This will not work with the in-memory journal permutation, as opening
          220  +# [db2] switches the journal mode back to "memory"
          221  +#
   219    222   ifcapable wal {
          223  +if {[permutation]!="inmemory_journal"} {
          224  +
   220    225     sqlite3 db test.db
   221    226     db eval {PRAGMA journal_mode=WAL}
   222    227     sqlite3 db2 test.db
   223    228     do_test pragma3-400 {
   224    229       db eval {
   225    230         PRAGMA data_version;
   226    231         PRAGMA journal_mode;
................................................................................
   237    242     do_test pragma3-420 {
   238    243       db eval {UPDATE t1 SET a=111*(a/100); PRAGMA data_version; SELECT * FROM t1}
   239    244     } {2 111 222}
   240    245     do_test pragma3-430 {
   241    246       db2 eval {PRAGMA data_version; SELECT * FROM t1;}
   242    247     } {3 111 222}
   243    248     db2 close
          249  +}
   244    250   }
   245    251   
   246    252   finish_test