Include recovery extension in configure/make builds of testfixture.

FossilOrigin-Name: d2f4652144c4a54012a2176c178c5ade3463bd017515f472cfa8dafdde192df3

diff --git a/Makefile.in b/Makefile.in
index cc4943f2c4416b66f6021297556e8328b8ca5f54..ca3dfdcae8ddf6a3b2c6e0c02719dce673a9e8d6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -433,6 +433,9 @@ TESTSRC = \
   $(TOP)/ext/fts3/fts3_term.c \
   $(TOP)/ext/fts3/fts3_test.c  \
   $(TOP)/ext/session/test_session.c \
+  $(TOP)/ext/recover/sqlite3recover.c \
+  $(TOP)/ext/misc/dbdata.c \
+  $(TOP)/ext/recover/test_recover.c \
   $(TOP)/ext/rbu/test_rbu.c 
 
 # Statically linked extensions
@@ -1102,6 +1105,9 @@ SHELL_SRC = \
        $(TOP)/ext/expert/sqlite3expert.h \
        $(TOP)/ext/misc/zipfile.c \
        $(TOP)/ext/misc/memtrace.c \
+       $(TOP)/ext/misc/dbdata.c \
+       $(TOP)/ext/recover/sqlite3recover.c \
+       $(TOP)/ext/recover/sqlite3recover.h \
         $(TOP)/src/test_windirent.c
 
 shell.c:       $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl

diff --git a/ext/recover/recovercorrupt2.test b/ext/recover/recovercorrupt2.test
index 58dee54815a1558456f82ce638a443d1657fcccf..cb5fa05baa9ad373f97ad8222e266fc9cf0d558f 100644 (file)
--- a/ext/recover/recovercorrupt2.test
+++ b/ext/recover/recovercorrupt2.test
@@ -30,6 +30,7 @@ do_execsql_test 1.0 {
   ANALYZE;
   PRAGMA writable_schema = 1;
   UPDATE sqlite_schema SET sql = 'CREATE INDEX i1 ON o(world)' WHERE name='i1'; 
+  DELETE FROM sqlite_schema WHERE name='sqlite_stat4';
 }
 
 do_test 1.1 {
@@ -45,7 +46,6 @@ do_execsql_test -db db2 1.2 {
   {CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c)}
   {CREATE TABLE t2(a PRIMARY KEY, b, c) WITHOUT ROWID} 
   {CREATE TABLE sqlite_stat1(tbl,idx,stat)} 
-  {CREATE TABLE sqlite_stat4(tbl,idx,neq,nlt,ndlt,sample)}
 }
 db2 close
 
@@ -66,7 +66,6 @@ do_execsql_test -db db2 1.5 {
 } {
   {CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c)}
   {CREATE TABLE sqlite_stat1(tbl,idx,stat)} 
-  {CREATE TABLE sqlite_stat4(tbl,idx,neq,nlt,ndlt,sample)}
 }
 db2 close
 

diff --git a/manifest b/manifest
index cc05de1c51b939e7b13f979888c21a69e08d92aa..77ef3c20e04aa0971a2042a12f058988cf675a7a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Extra\stests\sand\sfixes.
-D 2022-09-14T18:57:46.380
+C Include\srecovery\sextension\sin\sconfigure/make\sbuilds\sof\stestfixture.
+D 2022-09-14T20:45:46.778
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 525bccb89e36a927f9312a231f054a2dc029f6af75901c7fc1a781d51b260323
+F Makefile.in 1dd98f0349f14a7b106ae05904d4d040b4d20f2ab8e2d3c34f8231ba08948e42
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -391,7 +391,7 @@ F ext/recover/recover1.test 3f26db7692ed98c0de4fc9511f3d3a2f2c91a137b7e6666f3b85
 F ext/recover/recover_common.tcl 6679af7dffc858e345053a91c9b0a897595b4a13007aceffafca75304ccb137c
 F ext/recover/recoverclobber.test 294dcc894124ab4ca3a7b35766630742a3d25810fceac22220beb64f70a33a60
 F ext/recover/recovercorrupt.test e3f3cbe0162ba681518aac9ea0ae8119f32ac93fb0900b5f09b6318966108e54
-F ext/recover/recovercorrupt2.test 7a1e3fe43231e7571aff4a09f359dcc0c98ef8f74d507c17953d35f2ad9f4c1f
+F ext/recover/recovercorrupt2.test a131d8005337c092e2dfa3b84909ed67ae82d22399a8cfb8c984b2939969ca42
 F ext/recover/recoverfault.test 3a0a32b9fc216592b97775d69220695b0926980c0f7424b7a59144e47d7cb568
 F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72ddb661669be9020d36b
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
@@ -2012,8 +2012,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 5b05be0861f35804270fbd184ad4b89c23e98cc2fbd56b9e4fe6197daef5fe49
-R 7d672439d169025c8f5a2255e79dee5d
+P deed5336931b23bb507c064d08e9899b33f04e4f7eee03beb8d7147eb4caa030
+R 280ffbfae11c88d50514166a9090fc16
 U dan
-Z 7e26bca497bd6fe58832c34f4ec41a30
+Z 303ba5cc3bab2dbc239e16c7c361938c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9efa9051fdd0a7b22a780b7965760b8439b1d6bd..bf8054daff1c55bde35d98380ce0e20e9ca9cd0d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-deed5336931b23bb507c064d08e9899b33f04e4f7eee03beb8d7147eb4caa030
\ No newline at end of file
+d2f4652144c4a54012a2176c178c5ade3463bd017515f472cfa8dafdde192df3
\ No newline at end of file