Index: test/autovacuum.test
==================================================================
--- test/autovacuum.test
+++ test/autovacuum.test
@@ -267,11 +267,11 @@
     SELECT rootpage FROM sqlite_master ORDER by rootpage
   }
 } {3 4 5 6 7 8 9 10}
 
 # Right now there are 5 free pages in the database. Consume and then free
-# a 520 pages. Then create 520 tables. This ensures that at least some of the
+# all 520 pages. Then create 520 tables. This ensures that at least some of the
 # desired root-pages reside on the second free-list trunk page, and that the
 # trunk itself is required at some point.
 do_test autovacuum-2.4.4 {
   execsql "
     INSERT INTO av3 VALUES ('[make_str abcde [expr 1020*520 + 500]]');
@@ -278,13 +278,24 @@
     DELETE FROM av3;
   "
 } {}
 set root_page_list [list]
 set pending_byte_page [expr ($::sqlite_pending_byte / 1024) + 1]
+
+# unusable_pages
+# These are either the pending_byte page or the pointer map pages
+#
+unset -nocomplain unusable_page
+if {[sqlite3 -has-codec]} {
+  array set unusable_page {205 1 408 1}
+} else {
+  array set unusable_page {207 1 412 1}
+}
+set unusable_page($pending_byte_page) 1
+
 for {set i 3} {$i<=532} {incr i} {
-  # 207 and 412 are pointer-map pages.
-  if { $i!=207 && $i!=412 && $i != $pending_byte_page} {
+  if {![info exists unusable_page($i)]} {
     lappend root_page_list $i
   }
 }
 if {$i >= $pending_byte_page} {
   lappend root_page_list $i

Index: test/backup4.test
==================================================================
--- test/backup4.test
+++ test/backup4.test
@@ -20,10 +20,15 @@
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix backup4
+
+# The codec logic does not work for zero-length database files.  A database
+# file must contain at least one page in order to be recognized as an
+# encrypted database.
+do_not_use_codec
 
 #-------------------------------------------------------------------------
 # At one point this test was failing because [db] was using an out of
 # date schema in test case 1.2.
 #

Index: test/close.test
==================================================================
--- test/close.test
+++ test/close.test
@@ -14,10 +14,14 @@
 
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set ::testprefix close
+
+# This module bypasses the "-key" logic in tester.tcl, so it cannot run
+# with the codec enabled.
+do_not_use_codec
 
 do_execsql_test 1.0 {
   CREATE TABLE t1(x);
   INSERT INTO t1 VALUES('one');
   INSERT INTO t1 VALUES('two');

Index: test/corrupt3.test
==================================================================
--- test/corrupt3.test
+++ test/corrupt3.test
@@ -16,14 +16,13 @@
 # $Id: corrupt3.test,v 1.2 2007/04/06 21:42:22 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-# Do not use a codec for tests in this file, as the database file is
-# manipulated directly using tcl scripts (using the [hexio_write] command).
-#
-do_not_use_codec
+# This module uses hard-coded offsets which do not work if the reserved_bytes
+# value is nonzero.
+if {[nonzero_reserved_bytes]} {finish_test; return;}
 
 # These tests deal with corrupt database files
 #
 database_may_be_corrupt
 

Index: test/corrupt4.test
==================================================================
--- test/corrupt4.test
+++ test/corrupt4.test
@@ -16,14 +16,13 @@
 # $Id: corrupt4.test,v 1.1 2007/09/07 14:32:07 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-# Do not use a codec for tests in this file, as the database file is
-# manipulated directly using tcl scripts (using the [hexio_write] command).
-#
-do_not_use_codec
+# This module uses hard-coded offsets which do not work if the reserved_bytes
+# value is nonzero.
+if {[nonzero_reserved_bytes]} {finish_test; return;}
 
 # These tests deal with corrupt database files
 #
 database_may_be_corrupt
 

Index: test/corrupt6.test
==================================================================
--- test/corrupt6.test
+++ test/corrupt6.test
@@ -17,14 +17,13 @@
 # $Id: corrupt6.test,v 1.2 2008/05/19 15:37:10 shane Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-# Do not use a codec for tests in this file, as the database file is
-# manipulated directly using tcl scripts (using the [hexio_write] command).
-#
-do_not_use_codec
+# This module uses hard-coded offsets which do not work if the reserved_bytes
+# value is nonzero.
+if {[nonzero_reserved_bytes]} {finish_test; return;}
 
 # These tests deal with corrupt database files
 #
 database_may_be_corrupt
 

Index: test/corrupt7.test
==================================================================
--- test/corrupt7.test
+++ test/corrupt7.test
@@ -17,14 +17,13 @@
 # $Id: corrupt7.test,v 1.8 2009/08/10 10:18:08 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-# Do not use a codec for tests in this file, as the database file is
-# manipulated directly using tcl scripts (using the [hexio_write] command).
-#
-do_not_use_codec
+# This module uses hard-coded offsets which do not work if the reserved_bytes
+# value is nonzero.
+if {[nonzero_reserved_bytes]} {finish_test; return;}
 
 # These tests deal with corrupt database files
 #
 database_may_be_corrupt
 

Index: test/corruptE.test
==================================================================
--- test/corruptE.test
+++ test/corruptE.test
@@ -16,14 +16,13 @@
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-# Do not use a codec for tests in this file, as the database file is
-# manipulated directly using tcl scripts (using the [hexio_write] command).
-#
-do_not_use_codec
+# This module uses hard-coded offsets which do not work if the reserved_bytes
+# value is nonzero.
+if {[nonzero_reserved_bytes]} {finish_test; return;}
 
 # These tests deal with corrupt database files
 #
 database_may_be_corrupt
 

Index: test/corruptG.test
==================================================================
--- test/corruptG.test
+++ test/corruptG.test
@@ -12,14 +12,13 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix corruptG
 
-# Do not use a codec for tests in this file, as the database file is
-# manipulated directly using tcl scripts (using the [hexio_write] command).
-#
-do_not_use_codec
+# This module uses hard-coded offsets which do not work if the reserved_bytes
+# value is nonzero.
+if {[nonzero_reserved_bytes]} {finish_test; return;}
 
 # These tests deal with corrupt database files
 #
 database_may_be_corrupt
 

Index: test/corruptH.test
==================================================================
--- test/corruptH.test
+++ test/corruptH.test
@@ -12,14 +12,14 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix corruptH
 
-# Do not use a codec for tests in this file, as the database file is
-# manipulated directly using tcl scripts (using the [hexio_write] command).
-#
-do_not_use_codec
+# This module uses hard-coded offsets which do not work if the reserved_bytes
+# value is nonzero.
+if {[nonzero_reserved_bytes]} {finish_test; return;}
+
 database_may_be_corrupt
 
 # The corruption migrations tested by the code in this file are not detected
 # mmap mode.
 #

Index: test/corruptI.test
==================================================================
--- test/corruptI.test
+++ test/corruptI.test
@@ -17,14 +17,14 @@
 if {[permutation]=="mmap"} {
   finish_test
   return
 }
 
-# Do not use a codec for tests in this file, as the database file is
-# manipulated directly using tcl scripts (using the [hexio_write] command).
-#
-do_not_use_codec
+# This module uses hard-coded offsets which do not work if the reserved_bytes
+# value is nonzero.
+if {[nonzero_reserved_bytes]} {finish_test; return;}
+
 database_may_be_corrupt
 
 # Initialize the database.
 #
 do_execsql_test 1.1 {

Index: test/corruptJ.test
==================================================================
--- test/corruptJ.test
+++ test/corruptJ.test
@@ -20,14 +20,14 @@
 if {[permutation]=="mmap"} {
   finish_test
   return
 }
 
-# Do not use a codec for tests in this file, as the database file is
-# manipulated directly using tcl scripts (using the [hexio_write] command).
-#
-do_not_use_codec
+# This module uses hard-coded offsets which do not work if the reserved_bytes
+# value is nonzero.
+if {[nonzero_reserved_bytes]} {finish_test; return;}
+
 database_may_be_corrupt
 
 # Initialize the database.
 #
 do_execsql_test 1.1 {

Index: test/crash8.test
==================================================================
--- test/crash8.test
+++ test/crash8.test
@@ -23,10 +23,11 @@
 
 ifcapable !crashtest {
   finish_test
   return
 }
+do_not_use_codec
 
 do_test crash8-1.1 {
   execsql {
     PRAGMA auto_vacuum=OFF;
     CREATE TABLE t1(a, b);

Index: test/e_uri.test
==================================================================
--- test/e_uri.test
+++ test/e_uri.test
@@ -11,11 +11,11 @@
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix e_uri
-
+do_not_use_codec
 db close
 
 proc parse_uri {uri} {
   testvfs tvfs2
   testvfs tvfs 

Index: test/e_vacuum.test
==================================================================
--- test/e_vacuum.test
+++ test/e_vacuum.test
@@ -157,39 +157,41 @@
   execsql { PRAGMA page_size = 2048 }
   execsql { PRAGMA auto_vacuum = NONE }
   execsql { PRAGMA page_size ; PRAGMA auto_vacuum }
 } {1024 1}
 
-# EVIDENCE-OF: R-08570-19916 However, when not in write-ahead log mode,
-# the page_size and/or auto_vacuum properties of an existing database
-# may be changed by using the page_size and/or pragma auto_vacuum
-# pragmas and then immediately VACUUMing the database.
-#
-do_test e_vacuum-1.3.2.1 {
-  execsql { PRAGMA journal_mode = delete }
-  execsql { PRAGMA page_size = 2048 }
-  execsql { PRAGMA auto_vacuum = NONE }
-  execsql VACUUM
-  execsql { PRAGMA page_size ; PRAGMA auto_vacuum }
-} {2048 0}
-
-# EVIDENCE-OF: R-48521-51450 When in write-ahead log mode, only the
-# auto_vacuum support property can be changed using VACUUM.
-#
-ifcapable wal {
-do_test e_vacuum-1.3.3.1 {
-  execsql { PRAGMA journal_mode = wal }
-  execsql { PRAGMA page_size ; PRAGMA auto_vacuum }
-} {2048 0}
-do_test e_vacuum-1.3.3.2 {
-  execsql { PRAGMA page_size = 1024 }
-  execsql { PRAGMA auto_vacuum = FULL }
-  execsql VACUUM
-  execsql { PRAGMA page_size ; PRAGMA auto_vacuum }
-} {2048 1}
-}
-
+if {![nonzero_reserved_bytes]} {
+  # EVIDENCE-OF: R-08570-19916 However, when not in write-ahead log mode,
+  # the page_size and/or auto_vacuum properties of an existing database
+  # may be changed by using the page_size and/or pragma auto_vacuum
+  # pragmas and then immediately VACUUMing the database.
+  #
+  do_test e_vacuum-1.3.2.1 {
+    execsql { PRAGMA journal_mode = delete }
+    execsql { PRAGMA page_size = 2048 }
+    execsql { PRAGMA auto_vacuum = NONE }
+    execsql VACUUM
+    execsql { PRAGMA page_size ; PRAGMA auto_vacuum }
+  } {2048 0}
+  
+  # EVIDENCE-OF: R-48521-51450 When in write-ahead log mode, only the
+  # auto_vacuum support property can be changed using VACUUM.
+  #
+  ifcapable wal {
+    do_test e_vacuum-1.3.3.1 {
+      execsql { PRAGMA journal_mode = wal }
+      execsql { PRAGMA page_size ; PRAGMA auto_vacuum }
+    } {2048 0}
+    do_test e_vacuum-1.3.3.2 {
+      execsql { PRAGMA page_size = 1024 }
+      execsql { PRAGMA auto_vacuum = FULL }
+      execsql VACUUM
+      execsql { PRAGMA page_size ; PRAGMA auto_vacuum }
+    } {2048 1}
+  }
+}
+  
 # EVIDENCE-OF: R-38001-03952 VACUUM only works on the main database. It
 # is not possible to VACUUM an attached database file.
 forcedelete test.db2
 create_db { PRAGMA auto_vacuum = NONE }
 do_execsql_test e_vacuum-2.1.1 {

Index: test/e_walauto.test
==================================================================
--- test/e_walauto.test
+++ test/e_walauto.test
@@ -21,10 +21,15 @@
 #
 if {$tcl_platform(os) == "OpenBSD"} {
   finish_test
   return
 }
+
+# This module uses hard-coded offsets which do not work if the reserved_bytes
+# value is nonzero.
+if {[nonzero_reserved_bytes]} {finish_test; return;}
+
 
 proc read_nbackfill {} {
   seek $::shmfd 96
   binary scan [read $::shmfd 4] n nBackfill
   set nBackfill

Index: test/eqp.test
==================================================================
--- test/eqp.test
+++ test/eqp.test
@@ -514,49 +514,51 @@
   2 0 0 {USE TEMP B-TREE FOR ORDER BY}
   0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (EXCEPT)}
 }
 
 
-#-------------------------------------------------------------------------
-# The following tests - eqp-6.* - test that the example C code on 
-# documentation page eqp.html works. The C code is duplicated in test1.c
-# and wrapped in Tcl command [print_explain_query_plan] 
-#
-set boilerplate {
-  proc explain_query_plan {db sql} {
-    set stmt [sqlite3_prepare_v2 db $sql -1 DUMMY]
-    print_explain_query_plan $stmt
-    sqlite3_finalize $stmt
-  }
-  sqlite3 db test.db
-  explain_query_plan db {%SQL%}
-  db close
-  exit
-}
-
-# Do a "Print Explain Query Plan" test.
-proc do_peqp_test {tn sql res} {
-  set fd [open script.tcl w]
-  puts $fd [string map [list %SQL% $sql] $::boilerplate]
-  close $fd
-
-  uplevel do_test $tn [list {
-    set fd [open "|[info nameofexec] script.tcl"]
-    set data [read $fd]
-    close $fd
-    set data
-  }] [list $res]
-}
-
-do_peqp_test 6.1 {
-  SELECT a, b FROM t1 EXCEPT SELECT d, 99 FROM t2 ORDER BY 1
-} [string trimleft {
+if {![nonzero_reserved_bytes]} {
+  #-------------------------------------------------------------------------
+  # The following tests - eqp-6.* - test that the example C code on 
+  # documentation page eqp.html works. The C code is duplicated in test1.c
+  # and wrapped in Tcl command [print_explain_query_plan] 
+  #
+  set boilerplate {
+    proc explain_query_plan {db sql} {
+      set stmt [sqlite3_prepare_v2 db $sql -1 DUMMY]
+      print_explain_query_plan $stmt
+      sqlite3_finalize $stmt
+    }
+    sqlite3 db test.db
+    explain_query_plan db {%SQL%}
+    db close
+    exit
+  }
+  
+  # Do a "Print Explain Query Plan" test.
+  proc do_peqp_test {tn sql res} {
+    set fd [open script.tcl w]
+    puts $fd [string map [list %SQL% $sql] $::boilerplate]
+    close $fd
+  
+    uplevel do_test $tn [list {
+      set fd [open "|[info nameofexec] script.tcl"]
+      set data [read $fd]
+      close $fd
+      set data
+    }] [list $res]
+  }
+  
+  do_peqp_test 6.1 {
+    SELECT a, b FROM t1 EXCEPT SELECT d, 99 FROM t2 ORDER BY 1
+  } [string trimleft {
 1 0 0 SCAN TABLE t1 USING COVERING INDEX i2
 2 0 0 SCAN TABLE t2
 2 0 0 USE TEMP B-TREE FOR ORDER BY
 0 0 0 COMPOUND SUBQUERIES 1 AND 2 (EXCEPT)
 }]
+}
 
 #-------------------------------------------------------------------------
 # The following tests - eqp-7.* - test that queries that use the OP_Count
 # optimization return something sensible with EQP.
 #

Index: test/incrblob.test
==================================================================
--- test/incrblob.test
+++ test/incrblob.test
@@ -124,10 +124,15 @@
 
   sqlite3 db test.db
   execsql "PRAGMA mmap_size = 0"
   execsql "PRAGMA auto_vacuum = $AutoVacuumMode"
 
+  # Extra value added to size answers
+  set ib2_extra 0
+  if {$AutoVacuumMode} {incr ib2_extra}
+  if {[nonzero_reserved_bytes]} {incr ib2_extra}
+
   do_test incrblob-2.$AutoVacuumMode.1 {
     set ::str [string repeat abcdefghij 2900]
     execsql {
       BEGIN;
       CREATE TABLE blobs(k PRIMARY KEY, v BLOB, i INTEGER);
@@ -134,11 +139,11 @@
       DELETE FROM blobs;
       INSERT INTO blobs VALUES('one', $::str || randstr(500,500), 45);
       COMMIT;
     }
     expr [file size test.db]/1024
-  } [expr 31 + $AutoVacuumMode]
+  } [expr 31 + $ib2_extra]
 
   ifcapable autovacuum {
     do_test incrblob-2.$AutoVacuumMode.2 {
       execsql {
         PRAGMA auto_vacuum;
@@ -161,11 +166,11 @@
     # If the database is not in auto-vacuum mode, the whole of
     # the overflow-chain must be scanned. In auto-vacuum mode,
     # sqlite uses the ptrmap pages to avoid reading the other pages.
     #
     nRead db
-  } [expr $AutoVacuumMode ? 4 : 30]
+  } [expr $AutoVacuumMode ? 4 : 30+$ib2_extra]
 
   do_test incrblob-2.$AutoVacuumMode.4 {
     string range [db one {SELECT v FROM blobs}] end-19 end
   } $::fragment
 
@@ -185,11 +190,11 @@
     # If the database is not in auto-vacuum mode, the whole of
     # the overflow-chain must be scanned. In auto-vacuum mode,
     # sqlite uses the ptrmap pages to avoid reading the other pages.
     #
     nRead db
-  } [expr $AutoVacuumMode ? 4 : 30]
+  } [expr $AutoVacuumMode ? 4 : 30 + $ib2_extra]
 
   # Pages 1 (the write-counter) and 32 (the blob data) were written.
   do_test incrblob-2.$AutoVacuumMode.6 {
     close $::blob
     nWrite db
@@ -208,11 +213,11 @@
     execsql { SELECT i FROM blobs } 
   } {45}
 
   do_test incrblob-2.$AutoVacuumMode.9 {
     nRead db
-  } [expr $AutoVacuumMode ? 4 : 30]
+  } [expr $AutoVacuumMode ? 4 : 30 + $ib2_extra]
 }
 sqlite3_soft_heap_limit $cmdlinearg(soft-heap-limit)
 
 #------------------------------------------------------------------------
 # incrblob-3.*: 
@@ -382,28 +387,28 @@
 #     Test that opening a blob in an attached database works.
 #
 ifcapable attach {
   do_test incrblob-5.1 {
     forcedelete test2.db test2.db-journal
-    set ::size [expr [file size [info script]]]
+    set ::size [expr [file size $::cmdlinearg(INFO_SCRIPT)]]
     execsql {
       ATTACH 'test2.db' AS aux;
       CREATE TABLE aux.files(name, text);
       INSERT INTO aux.files VALUES('this one', zeroblob($::size));
     }
     set fd  [db incrblob aux files text 1]
     fconfigure $fd -translation binary
-    set fd2 [open [info script]]
+    set fd2 [open $::cmdlinearg(INFO_SCRIPT)]
     fconfigure $fd2 -translation binary
     puts -nonewline $fd [read $fd2]
     close $fd
     close $fd2
     set ::text [db one {select text from aux.files}]
     string length $::text
-  } [file size [info script]]
+  } [file size $::cmdlinearg(INFO_SCRIPT)]
   do_test incrblob-5.2 {
-    set fd2 [open [info script]]
+    set fd2 [open $::cmdlinearg(INFO_SCRIPT)]
     fconfigure $fd2 -translation binary
     set ::data [read $fd2]
     close $fd2
     set ::data
   } $::text
@@ -574,11 +579,11 @@
     }
   } {15}
 
 }
 
-set fd [open [info script]]
+set fd [open $::cmdlinearg(INFO_SCRIPT)]
 fconfigure $fd -translation binary
 set ::data [read $fd 14000]
 close $fd
 
 db close

Index: test/incrblob_err.test
==================================================================
--- test/incrblob_err.test
+++ test/incrblob_err.test
@@ -22,16 +22,16 @@
 }
 
 source $testdir/malloc_common.tcl
 
 unset -nocomplain ::fd ::data
-set ::fd [open [info script]]
+set ::fd [open $::cmdlinearg(INFO_SCRIPT)]
 set ::data [read $::fd]
 close $::fd
 
 do_malloc_test 1 -tclprep {
-  set bytes [file size [info script]]
+  set bytes [file size $::cmdlinearg(INFO_SCRIPT)]
   execsql {
     CREATE TABLE blobs(k, v BLOB);
     INSERT INTO blobs VALUES(1, zeroblob($::bytes));
   }
 } -tclbody {

Index: test/io.test
==================================================================
--- test/io.test
+++ test/io.test
@@ -422,11 +422,11 @@
   } {1 0}
   do_test io-3.3 {
     # The COMMIT requires a single fsync() - to the database file.
     execsql { COMMIT }
     list [file size test.db] [nSync]
-  } {39936 1}
+  } "[expr {[nonzero_reserved_bytes]?40960:39936}] 1"
 }
 
 #----------------------------------------------------------------------
 # Test cases io-4.* test the IOCAP_SAFE_APPEND optimization.
 #

Index: test/memsubsys1.test
==================================================================
--- test/memsubsys1.test
+++ test/memsubsys1.test
@@ -253,11 +253,11 @@
 do_test memsubsys1-7.4 {
   set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
 } 0
 do_test memsubsys1-7.5 {
   set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-  expr {$maxreq<4100}
+  expr {$maxreq<4100 + 4200*[nonzero_reserved_bytes]}
 } 1
 do_test memsubsys1-7.6 {
   set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
 } 1
 do_test memsubsys1-7.7 {

Index: test/mmap1.test
==================================================================
--- test/mmap1.test
+++ test/mmap1.test
@@ -86,11 +86,11 @@
 
     # Have connection 2 shrink the file. Check connection 1 can still read it.
     sql2 { DELETE FROM t1 WHERE rowid%2; }
     do_test $t.$tn.2 {
       sql1 "SELECT count(*) FROM t1; PRAGMA integrity_check ; PRAGMA page_count"
-    } {16 ok 42}
+    } "16 ok [expr {42+[nonzero_reserved_bytes]}]"
 
     # Have connection 2 grow the file. Check connection 1 can still read it.
     sql2 { INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1 }
     do_test $t.$tn.3 {
       sql1 "SELECT count(*) FROM t1; PRAGMA integrity_check ; PRAGMA page_count"
@@ -102,11 +102,13 @@
       sql1 "SELECT count(*) FROM t1; PRAGMA integrity_check ; PRAGMA page_count"
     } {64 ok 149}
 
     # Check that the number of pages read by connection 1 indicates that the
     # "PRAGMA mmap_size" command worked.
-    do_test $t.$tn.5 { nRead db } $nRead
+    if {[nonzero_reserved_bytes]==0} {
+      do_test $t.$tn.5 { nRead db } $nRead
+    }
   }
 }
 
 set ::rcnt 0
 proc rblob {n} {

Index: test/mmap3.test
==================================================================
--- test/mmap3.test
+++ test/mmap3.test
@@ -17,10 +17,13 @@
   return
 }
 source $testdir/lock_common.tcl
 set testprefix mmap3
 
+# A codec shuts down memory-mapped I/O
+if {[nonzero_reserved_bytes]} {finish_test; return;}
+
 do_test mmap3-1.0 {
   load_static_extension db wholenumber
   db eval {
     PRAGMA mmap_size=100000;
     CREATE TABLE t1(x, y);

Index: test/nan.test
==================================================================
--- test/nan.test
+++ test/nan.test
@@ -149,49 +149,51 @@
 # of tests writes a normal floating point value (0.5) into the database,
 # then writes directly into the database file to change the 0.5 into NaN.
 # Then it reads the value of the database to verify it is converted into
 # NULL.
 #
-do_test nan-3.1 {
-  db eval {
-    DELETE FROM t1;
-    INSERT INTO t1 VALUES(0.5);
-    PRAGMA auto_vacuum=OFF;
-    PRAGMA page_size=1024;
-    VACUUM;
-  }
-  hexio_read test.db 2040 8
-} {3FE0000000000000}
-do_test nan-3.2 {
-  db eval {
-    SELECT x, typeof(x) FROM t1
-  }
-} {0.5 real}
-do_test nan-3.3 {
-  db close
-  hexio_write test.db 2040 FFF8000000000000
-  sqlite3 db test.db
-  db eval {SELECT x, typeof(x) FROM t1}
-} {{} null}
-do_test nan-3.4 {
-  db close
-  hexio_write test.db 2040 7FF8000000000000
-  sqlite3 db test.db
-  db eval {SELECT x, typeof(x) FROM t1}
-} {{} null}
-do_test nan-3.5 {
-  db close
-  hexio_write test.db 2040 FFFFFFFFFFFFFFFF
-  sqlite3 db test.db
-  db eval {SELECT x, typeof(x) FROM t1}
-} {{} null}
-do_test nan-3.6 {
-  db close
-  hexio_write test.db 2040 7FFFFFFFFFFFFFFF
-  sqlite3 db test.db
-  db eval {SELECT x, typeof(x) FROM t1}
-} {{} null}
+if {![nonzero_reserved_bytes]} {
+  do_test nan-3.1 {
+    db eval {
+      DELETE FROM t1;
+      INSERT INTO t1 VALUES(0.5);
+      PRAGMA auto_vacuum=OFF;
+      PRAGMA page_size=1024;
+      VACUUM;
+    }
+    hexio_read test.db 2040 8
+  } {3FE0000000000000}
+  do_test nan-3.2 {
+    db eval {
+      SELECT x, typeof(x) FROM t1
+    }
+  } {0.5 real}
+  do_test nan-3.3 {
+    db close
+    hexio_write test.db 2040 FFF8000000000000
+    sqlite3 db test.db
+    db eval {SELECT x, typeof(x) FROM t1}
+  } {{} null}
+  do_test nan-3.4 {
+    db close
+    hexio_write test.db 2040 7FF8000000000000
+    sqlite3 db test.db
+    db eval {SELECT x, typeof(x) FROM t1}
+  } {{} null}
+  do_test nan-3.5 {
+    db close
+    hexio_write test.db 2040 FFFFFFFFFFFFFFFF
+    sqlite3 db test.db
+    db eval {SELECT x, typeof(x) FROM t1}
+  } {{} null}
+  do_test nan-3.6 {
+    db close
+    hexio_write test.db 2040 7FFFFFFFFFFFFFFF
+    sqlite3 db test.db
+    db eval {SELECT x, typeof(x) FROM t1}
+  } {{} null}
+}
 
 # Verify that the sqlite3AtoF routine is able to handle extreme
 # numbers.
 #
 do_test nan-4.1 {

Index: test/pager1.test
==================================================================
--- test/pager1.test
+++ test/pager1.test
@@ -1394,30 +1394,51 @@
   faultsim_delete_and_reopen
 
   execsql { PRAGMA page_size = 1024 }
   for {set ii 0} {$ii < 4} {incr ii} { execsql "CREATE TABLE t${ii}(a, b)" }
 } {}
-do_test pager1-9.3.2 {
-  sqlite3 db2 test.db2
-
-  execsql {
-    PRAGMA page_size = 4096;
-    PRAGMA synchronous = OFF;
-    CREATE TABLE t1(a, b);
-    CREATE TABLE t2(a, b);
-  } db2
-
-  sqlite3_backup B db2 main db main
-  B step 30
-  list [B step 10000] [B finish]
-} {SQLITE_DONE SQLITE_OK}
-do_test pager1-9.3.3 {
-  db2 close
-  db close
-  tv delete
-  file size test.db2
-} [file size test.db]
+if {[nonzero_reserved_bytes]} {
+  # backup with a page size changes is not possible with the codec
+  #
+  do_test pager1-9.3.2codec {
+    sqlite3 db2 test.db2
+    execsql {
+      PRAGMA page_size = 4096;
+      PRAGMA synchronous = OFF;
+      CREATE TABLE t1(a, b);
+      CREATE TABLE t2(a, b);
+    } db2
+    sqlite3_backup B db2 main db main
+    B step 30
+    list [B step 10000] [B finish]
+  } {SQLITE_READONLY SQLITE_READONLY}
+  do_test pager1-9.3.3codec {
+    db2 close
+    db close
+    tv delete
+    file size test.db2
+  } [file size test.db2]
+} else {
+  do_test pager1-9.3.2 {
+    sqlite3 db2 test.db2
+    execsql {
+      PRAGMA page_size = 4096;
+      PRAGMA synchronous = OFF;
+      CREATE TABLE t1(a, b);
+      CREATE TABLE t2(a, b);
+    } db2
+    sqlite3_backup B db2 main db main
+    B step 30
+    list [B step 10000] [B finish]
+  } {SQLITE_DONE SQLITE_OK}
+  do_test pager1-9.3.3 {
+    db2 close
+    db close
+    tv delete
+    file size test.db2
+  } [file size test.db]
+}
 
 do_test pager1-9.4.1 {
   faultsim_delete_and_reopen
   sqlite3 db2 test.db2
   execsql {
@@ -2445,17 +2466,27 @@
     CREATE TABLE t1(a, b);
     INSERT INTO t1 VALUES(1, 2);
   }
   file size test.db
 } [expr 1024*3]
-do_test pager1-29.2 {
-  execsql {
-    PRAGMA page_size = 4096;
-    VACUUM;
-  }
-  file size test.db
-} [expr 4096*3]
+if {[nonzero_reserved_bytes]} {
+  # VACUUM with size changes is not possible with the codec.
+  do_test pager1-29.2 {
+    catchsql {
+      PRAGMA page_size = 4096;
+      VACUUM;
+    }
+  } {1 {attempt to write a readonly database}}
+} else {
+  do_test pager1-29.2 {
+    execsql {
+      PRAGMA page_size = 4096;
+      VACUUM;
+    }
+    file size test.db
+  } [expr 4096*3]
+}
 
 #-------------------------------------------------------------------------
 # Test that if an empty database file (size 0 bytes) is opened in 
 # exclusive-locking mode, any journal file is deleted from the file-system
 # without being rolled back. And that the RESERVED lock obtained while

Index: test/pageropt.test
==================================================================
--- test/pageropt.test
+++ test/pageropt.test
@@ -14,10 +14,11 @@
 #
 # $Id: pageropt.test,v 1.5 2008/08/20 14:49:25 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+do_not_use_codec
 
 ifcapable {!pager_pragmas||secure_delete||direct_read} {
   finish_test
   return
 }

Index: test/pragma.test
==================================================================
--- test/pragma.test
+++ test/pragma.test
@@ -1739,77 +1739,79 @@
 
 forcedelete data_dir
 } ;# endif windows
 
 database_may_be_corrupt
-
-do_test 21.1 {
-  # Create a corrupt database in testerr.db. And a non-corrupt at test.db.
-  #
-  db close
-  forcedelete test.db
-  sqlite3 db test.db
-  execsql { 
-    PRAGMA page_size = 1024;
-    PRAGMA auto_vacuum = 0;
-    CREATE TABLE t1(a PRIMARY KEY, b);
-    INSERT INTO t1 VALUES(1, 1);
-  }
-  for {set i 0} {$i < 10} {incr i} {
-    execsql { INSERT INTO t1 SELECT a + (1 << $i), b + (1 << $i) FROM t1 }
-  }
-  db close
-  forcecopy test.db testerr.db
-  hexio_write testerr.db 15000 [string repeat 55 100]
-} {100}
-
-set mainerr {*** in database main ***
-Multiple uses for byte 672 of page 15}
-set auxerr {*** in database aux ***
-Multiple uses for byte 672 of page 15}
-
-set mainerr {/{\*\*\* in database main \*\*\*
-Multiple uses for byte 672 of page 15}.*/}
-set auxerr {/{\*\*\* in database aux \*\*\*
-Multiple uses for byte 672 of page 15}.*/}
-
-do_test 22.2 {
-  catch { db close }
-  sqlite3 db testerr.db
-  execsql { PRAGMA integrity_check }
-} $mainerr
-
-do_test 22.3.1 {
-  catch { db close }
-  sqlite3 db test.db
-  execsql { 
-    ATTACH 'testerr.db' AS 'aux';
-    PRAGMA integrity_check;
-  }
-} $auxerr
-do_test 22.3.2 {
-  execsql { PRAGMA main.integrity_check; }
-} {ok}
-do_test 22.3.3 {
-  execsql { PRAGMA aux.integrity_check; }
-} $auxerr
-
-do_test 22.4.1 {
-  catch { db close }
-  sqlite3 db testerr.db
-  execsql { 
-    ATTACH 'test.db' AS 'aux';
-    PRAGMA integrity_check;
-  }
-} $mainerr
-do_test 22.4.2 {
-  execsql { PRAGMA main.integrity_check; }
-} $mainerr
-do_test 22.4.3 {
-  execsql { PRAGMA aux.integrity_check; }
-} {ok}
-
+if {![nonzero_reserved_bytes]} {
+
+  do_test 21.1 {
+    # Create a corrupt database in testerr.db. And a non-corrupt at test.db.
+    #
+    db close
+    forcedelete test.db
+    sqlite3 db test.db
+    execsql { 
+      PRAGMA page_size = 1024;
+      PRAGMA auto_vacuum = 0;
+      CREATE TABLE t1(a PRIMARY KEY, b);
+      INSERT INTO t1 VALUES(1, 1);
+    }
+    for {set i 0} {$i < 10} {incr i} {
+      execsql { INSERT INTO t1 SELECT a + (1 << $i), b + (1 << $i) FROM t1 }
+    }
+    db close
+    forcecopy test.db testerr.db
+    hexio_write testerr.db 15000 [string repeat 55 100]
+  } {100}
+  
+  set mainerr {*** in database main ***
+Multiple uses for byte 672 of page 15}
+  set auxerr {*** in database aux ***
+Multiple uses for byte 672 of page 15}
+  
+  set mainerr {/{\*\*\* in database main \*\*\*
+Multiple uses for byte 672 of page 15}.*/}
+  set auxerr {/{\*\*\* in database aux \*\*\*
+Multiple uses for byte 672 of page 15}.*/}
+  
+  do_test 22.2 {
+    catch { db close }
+    sqlite3 db testerr.db
+    execsql { PRAGMA integrity_check }
+  } $mainerr
+  
+  do_test 22.3.1 {
+    catch { db close }
+    sqlite3 db test.db
+    execsql { 
+      ATTACH 'testerr.db' AS 'aux';
+      PRAGMA integrity_check;
+    }
+  } $auxerr
+  do_test 22.3.2 {
+    execsql { PRAGMA main.integrity_check; }
+  } {ok}
+  do_test 22.3.3 {
+    execsql { PRAGMA aux.integrity_check; }
+  } $auxerr
+  
+  do_test 22.4.1 {
+    catch { db close }
+    sqlite3 db testerr.db
+    execsql { 
+      ATTACH 'test.db' AS 'aux';
+      PRAGMA integrity_check;
+    }
+  } $mainerr
+  do_test 22.4.2 {
+    execsql { PRAGMA main.integrity_check; }
+  } $mainerr
+  do_test 22.4.3 {
+    execsql { PRAGMA aux.integrity_check; }
+  } {ok}
+}
+  
 db close
 forcedelete test.db test.db-wal test.db-journal
 sqlite3 db test.db
 sqlite3 db2 test.db
 do_test 23.1 {

Index: test/pragma3.test
==================================================================
--- test/pragma3.test
+++ test/pragma3.test
@@ -13,10 +13,11 @@
 # This file implements tests for PRAGMA data_version command.
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+do_not_use_codec
 
 do_execsql_test pragma3-100 {
   PRAGMA data_version;
 } {1}
 do_execsql_test pragma3-101 {

Index: test/stat.test
==================================================================
--- test/stat.test
+++ test/stat.test
@@ -19,10 +19,14 @@
 ifcapable !vtab||!compound {
   finish_test
   return
 }
 
+# This module uses hard-coded results that depend on exact measurements of
+# pages sizes at the byte level, and hence will not work if the reserved_bytes
+# value is nonzero.
+if {[nonzero_reserved_bytes]} {finish_test; return;}
 
 set ::asc 1
 proc a_string {n} { string range [string repeat [incr ::asc]. $n] 1 $n }
 db func a_string a_string
 

Index: test/superlock.test
==================================================================
--- test/superlock.test
+++ test/superlock.test
@@ -13,10 +13,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 source $testdir/lock_common.tcl
 
 set testprefix superlock
+do_not_use_codec
 
 # Test organization:
 #
 #   1.*: Test superlock on a rollback database. Test that once the db is
 #        superlocked, it is not possible for a second client to read from
@@ -236,17 +237,27 @@
 
 db_swap test.db2 test.db
 do_catchsql_test 6.9 { SELECT * FROM t1 } {0 {1 2 3 4}}
 do_catchsql_test 6.10 { SELECT * FROM t2 } {1 {no such table: t2}}
 
-do_execsql_test  6.11 { 
-  PRAGMA journal_mode = delete;
-  PRAGMA page_size = 512;
-  VACUUM;
-  PRAGMA journal_mode = wal;
-  INSERT INTO t1 VALUES(5, 6);
-} {delete wal}
+if {[nonzero_reserved_bytes]} {
+  # Vacuum with a size change is not allowed with the codec
+  do_execsql_test  6.11codec { 
+    PRAGMA journal_mode = delete;
+    VACUUM;
+    PRAGMA journal_mode = wal;
+    INSERT INTO t1 VALUES(5, 6);
+  } {delete wal}
+} else {
+  do_execsql_test  6.11 { 
+    PRAGMA journal_mode = delete;
+    PRAGMA page_size = 512;
+    VACUUM;
+    PRAGMA journal_mode = wal;
+    INSERT INTO t1 VALUES(5, 6);
+  } {delete wal}
+}
 
 db_swap test.db2 test.db
 do_catchsql_test 6.12 { SELECT * FROM t1 } {1 {no such table: t1}}
 do_catchsql_test 6.13 { SELECT * FROM t2 } {0 {a b}}
 

Index: test/tclsqlite.test
==================================================================
--- test/tclsqlite.test
+++ test/tclsqlite.test
@@ -20,14 +20,13 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
 # Check the error messages generated by tclsqlite
 #
+set r "sqlite_orig HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN? ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN? ?-uri BOOLEAN?"
 if {[sqlite3 -has-codec]} {
-  set r "sqlite_orig HANDLE FILENAME ?-key CODEC-KEY?"
-} else {
-  set r "sqlite_orig HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN? ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN? ?-uri BOOLEAN?"
+  append r " ?-key CODECKEY?"
 }
 do_test tcl-1.1 {
   set v [catch {sqlite3 bogus} msg]
   regsub {really_sqlite3} $msg {sqlite3} msg
   lappend v $msg

Index: test/tester.tcl
==================================================================
--- test/tester.tcl
+++ test/tester.tcl
@@ -371,10 +371,16 @@
 #
 proc do_not_use_codec {} {
   set ::do_not_use_codec 1
   reset_db
 }
+
+# Return true if the "reserved_bytes" integer on database files is non-zero.
+#
+proc nonzero_reserved_bytes {} {
+  return [sqlite3 -has-codec]
+}
 
 # Print a HELP message and exit
 #
 proc print_help_and_quit {} {
   puts {Options:
@@ -519,10 +525,11 @@
       }
     }
   }
   set testdir [file normalize $testdir]
   set cmdlinearg(TESTFIXTURE_HOME) [pwd]
+  set cmdlinearg(INFO_SCRIPT) [file normalize [info script]]
   set argv0 [file normalize $argv0]
   if {$cmdlinearg(testdir)!=""} {
     file mkdir $cmdlinearg(testdir)
     cd $cmdlinearg(testdir)
   }

Index: test/tkt4018.test
==================================================================
--- test/tkt4018.test
+++ test/tkt4018.test
@@ -14,10 +14,11 @@
 # fixed.  
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+do_not_use_codec
 
 proc testsql {sql} {
   set fd [open tf_main.tcl w]
   puts $fd [subst -nocommands {
     sqlite3_test_control_pending_byte 0x0010000

Index: test/wal.test
==================================================================
--- test/wal.test
+++ test/wal.test
@@ -1376,10 +1376,11 @@
 } {ok}
 
 #-------------------------------------------------------------------------
 # Test reading and writing of databases with different page-sizes.
 #
+incr ::do_not_use_codec
 foreach pgsz {512 1024 2048 4096 8192 16384 32768 65536} {
   do_multiclient_test tn [string map [list %PGSZ% $pgsz] {
     do_test wal-22.%PGSZ%.$tn.1 {
       sql1 {
         PRAGMA main.page_size = %PGSZ%;
@@ -1396,10 +1397,11 @@
       sql1 {PRAGMA wal_checkpoint}
       expr {[file size test.db] % %PGSZ%}
     } {0}
   }]
 }
+incr ::do_not_use_codec -1
 
 #-------------------------------------------------------------------------
 # Test that when 1 or more pages are recovered from a WAL file, 
 # sqlite3_log() is invoked to report this to the user.
 #

Index: test/wal5.test
==================================================================
--- test/wal5.test
+++ test/wal5.test
@@ -16,10 +16,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 source $testdir/lock_common.tcl
 source $testdir/wal_common.tcl
 ifcapable !wal {finish_test ; return }
+do_not_use_codec
 
 set testprefix wal5
 
 proc db_page_count  {{file test.db}} { expr [file size $file] / 1024 }
 proc wal_page_count {{file test.db}} { wal_frame_count ${file}-wal 1024 }

Index: test/wal8.test
==================================================================
--- test/wal8.test
+++ test/wal8.test
@@ -25,10 +25,11 @@
 #
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set ::testprefix wal8
 ifcapable !wal {finish_test ; return }
+do_not_use_codec
 
 db close
 forcedelete test.db test.db-wal
 
 sqlite3 db test.db

Index: test/walbak.test
==================================================================
--- test/walbak.test
+++ test/walbak.test
@@ -125,10 +125,11 @@
       INSERT INTO t1 SELECT randomblob(500), randomblob(500) FROM t1; /* 64 */
     COMMIT;
   }
 } {}
 do_test walbak-2.2 {
+  forcedelete abc.db
   db backup abc.db
   sqlite3 db2 abc.db
   string compare [sig db] [sig db2]
 } {0}
 
@@ -237,10 +238,11 @@
       CREATE TABLE xx(x);
     }
   }
 
 } {
+  if {$tn==4 && [sqlite3 -has-codec]} continue
   foreach f [glob -nocomplain test.db*] { forcedelete $f }
 
   eval $setup
 
   do_test walbak-3.$tn.1 {

Index: test/walro.test
==================================================================
--- test/walro.test
+++ test/walro.test
@@ -210,11 +210,11 @@
       INSERT INTO t2 SELECT x||y, y||x FROM t2;
       INSERT INTO t2 SELECT x||y, y||x FROM t2;
       INSERT INTO t2 SELECT x||y, y||x FROM t2;
     }
     file size test.db-wal
-  } {147800}
+  } [expr {[nonzero_reserved_bytes]?148848:147800}]
   do_test 1.4.4.2 {
     csql1 { SELECT * FROM t1 }
   } {0 {a b c d e f g h i j k l 1 2 3 4 5 6}}
   do_test 1.4.4.3 {
     csql2 COMMIT