Merge latest begin-concurrent changes into this branch.

FossilOrigin-Name: 76608f750ab13c0a165def9672759fee43cf4e9895df3bfa21765e08358b07a0

test/permutations.test

@@ -48,13 +48,6 @@ proc test_suite {name args} {
     set options([lindex $o 0]) $v
   }
 
-  # Transform "-presql" into a "dbconfig" script
-  #
-  if {[info exists options(-presql)]} {
-    append options(-dbconfig) "\n\$::dbhandle eval { $options(-presql) }"
-    unset options(-presql)
-  }
-
   set     ::testspec($name) [array get options]
   lappend ::testsuitelist $name
 }
@@ -261,6 +254,7 @@ test_suite "fts3" -prefix "" -description {
   fts3am.test fts3an.test fts3ao.test fts3atoken.test
   fts3auto.test fts3aux1.test fts3aux2.test fts3b.test
   fts3comp1.test fts3conf.test fts3corrupt2.test fts3corrupt.test
+  fts3corrupt4.test
   fts3cov.test fts3c.test fts3defer2.test fts3defer3.test
   fts3defer.test fts3drop.test fts3d.test fts3e.test
   fts3expr2.test fts3expr3.test fts3expr4.test fts3expr5.test
@@ -1088,6 +1082,7 @@ proc run_tests {name args} {
   set options(-shutdown) ""
   set options(-prefix) ""
   set options(-dbconfig) ""
+  set options(-presql) ""
 
   array set options $args
 
@@ -1095,6 +1090,7 @@ proc run_tests {name args} {
   set ::G(perm:prefix)       $options(-prefix)
   set ::G(isquick)           1
   set ::G(perm:dbconfig)     $options(-dbconfig)
+  set ::G(perm:presql)       $options(-presql)
 
   foreach file [lsort $options(-files)] {
     uplevel $options(-initialize)
@@ -1108,6 +1104,7 @@ proc run_tests {name args} {
   unset ::G(perm:name)
   unset ::G(perm:prefix)
   unset ::G(perm:dbconfig)
+  unset ::G(perm:presql)
 }
 
 proc run_test_suite {name} {