Merge version 3.40.0 into the reuse-schema branch.

FossilOrigin-Name: 2aec00a7294762b3f7e8138ea1686eda4a1b02e940ec39f261651b61b87fabad

manifest

@@ -1,5 +1,5 @@
-C Merge\sthe\s3.40.0\src1\schanges\sinto\sthe\sreuse-schema\sbranch.
-D 2022-11-14T13:41:22.770
+C Merge\sversion\s3.40.0\sinto\sthe\sreuse-schema\sbranch.
+D 2022-11-16T16:14:31.289
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -649,7 +649,7 @@ F src/status.c 501433a8bdf64be125746a53bb9180761f9364428b59b318365eb88afd6d5cea
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c c5b9f6540d6de1adc6554589ce4011e07bb02250440a3e777ff86b40f1c1dd2c
 F src/test1.c 40c9a40975512985762f87b83d0c63e4904833a9fe78cbcca664a37095301b1d
-F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
+F src/test2.c 827446e259a3b7ab949da1542953edda7b5117982576d3e6f1c24a0dd20a5cef
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
 F src/test4.c 4533b76419e7feb41b40582554663ed3cd77aaa54e135cf76b3205098cd6e664
 F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@ -824,9 +824,9 @@ F test/bestindex9.test bf2eb8556e8d5c00ef3ee18c521751cd03c1b55454b6e7683b4c6742e
 F test/between.test b9a65fb065391980119e8a781a7409d3fcf059d89968279c750e190a9a1d5263
 F test/bigfile.test aa74f4e5db51c8e54a1d9de9fa65d01d1eb20b59
 F test/bigfile2.test 1b489a3a39ae90c7f027b79110d6b4e1dbc71bfc
-F test/bigmmap.test b820c234daa56d24bc3bf006e3ac7aa9d9623c8ac656a38f59063b444a2d65d1
+F test/bigmmap.test 6021e205487347c6d7e5a541aa472a4b8efc4e9f4a3799a823b61a8e6616105d
 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
-F test/bigsort.test 8299fa9298f4f1e02fc7d2712e8b77d6cd60e5a2
+F test/bigsort.test 997e172009905873c06426145e4b3794c7dfe2d563724cb2fd39d45f319cf3d2
 F test/bind.test 1e136709b306f7ed3192d349c2930d89df6ab621654ad6f1a72381d3fe76f483
 F test/bind2.test 918bc35135f4141809ead7585909cde57d44db90a7a62aef540127148f91aab7
 F test/bindxfer.test efecd12c580c14df5f4ad3b3e83c667744a4f7e0
@@ -2065,8 +2065,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 833f6374cc81a9b732bd852de6f98eef6c437f9fb18846e0022c6726324fab25 80ff592a9d0157bfa8bd1f9959c3aa26cab0ec16fdccf7b58a7523b8912c1a8c
-R 20548f17ccb5c5c07ea43692a286d7f5
+P 886788b61e227a5e821eb92e01aaeaf19b2e9412408a9c1a351c85546452a807 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318
+R d895d42470e7754764a7d1b2f285f17c
 U drh
-Z 0fd4751246a259e63474f8c0e15e9d17
+Z 880021cb07648deca41ce071718c2769
 # Remove this line to create a well-formed Fossil manifest.

manifest.uuid

@@ -1 +1 @@
-886788b61e227a5e821eb92e01aaeaf19b2e9412408a9c1a351c85546452a807
+2aec00a7294762b3f7e8138ea1686eda4a1b02e940ec39f261651b61b87fabad

src/test2.c

@@ -521,6 +521,14 @@ static int SQLITE_TCLAPI fake_big_file(
     return TCL_ERROR;
   }
   if( Tcl_GetInt(interp, argv[1], &n) ) return TCL_ERROR;
+#if defined(_WIN32)
+  if( n>2 ){
+    Tcl_AppendResult(interp, "cannot create ", argv[1],
+       "MB file because Windows "
+       "does not support sparse files", (void*)0);
+    return TCL_ERROR;
+  }
+#endif
 
   pVfs = sqlite3_vfs_find(0);
   nFile = (int)strlen(argv[2]);

test/bigmmap.test

@@ -52,7 +52,11 @@ do_execsql_test 1.0 {
 }
 
 for {set i 1} {$i < 8} {incr i} {
-  fake_big_file [expr $i*1024] [get_pwd]/test.db
+  if {[catch {fake_big_file [expr $i*1024] [get_pwd]/test.db}]} {
+    puts "Cannot create ${i}MB sparse file"
+    finish_test
+    return
+  }
   hexio_write test.db 28 [format %.8x [expr ($i*1024*1024*1024/4096) - 5]]
 
   do_execsql_test 1.$i "

test/bigsort.test

@@ -24,10 +24,17 @@ set testprefix bigsort
 # memory.  Make sure the host has at least 8GB available before running
 # this test.
 #
+# Update: https://sqlite.org/src/info/7c96a56 adds assert() statements
+# that make this test too slow to run with SQLITE_DEBUG builds.
+#
 if {[catch {exec free | grep Mem:} out] || [lindex $out 1]<8000000} {
   finish_test
   return
 }
+ifcapable debug {
+  finish_test
+  return
+}
 
 do_execsql_test 1.0 {
   PRAGMA page_size = 1024;