Prototype implementation of "PRAGMA reset_database". This pragma differs from

SQLITE_DBCONFIG_RESET_DATABASE in that the pragma only works if the database is reasonably well-formed, whereas the dbconfig works regardless. FossilOrigin-Name: cf0999d4f8fd120c4796240600cd42fcc8baa056efad432d0dae7da372023787
2022-09-28 17:10:23 +00:00
30 changed files with 291 additions and 672 deletions
@@ -35,7 +35,7 @@ TCC += -I${TOP}/ext/fts3 -I${TOP}/ext/async -I${TOP}/ext/session
 TCC += -I${TOP}/ext/userauth

 # Define this for the autoconf-based build, so that the code knows it can
-# include the generated sqlite_cfg.h
+# include the generated config.h
 #
 TCC += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite

@@ -377,7 +377,7 @@ SRC += \
  opcodes.h \
  parse.c \
  parse.h \
-  sqlite_cfg.h \
+  config.h \
  shell.c \
  sqlite3.h

@@ -555,7 +555,7 @@ HDR = \
   $(TOP)/src/vdbeInt.h \
   $(TOP)/src/vxworks.h \
   $(TOP)/src/whereInt.h \
-   sqlite_cfg.h
+   config.h

 # Header files used by extensions
 #
@@ -1501,7 +1501,7 @@ clean:
 	rm -f threadtest5

 distclean:	clean
-	rm -f sqlite_cfg.h config.log config.status libtool Makefile sqlite3.pc \
+	rm -f config.h config.log config.status libtool Makefile sqlite3.pc \
 		$(TESTPROGS)

 #
@@ -1,4 +1,4 @@
-/* sqlite_cfg.h.in.  Generated from configure.ac by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */

 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
@@ -45,16 +45,16 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H

-/* Define to 1 if you have the `pread' function. */
+/* Define to 1 if you have the pread() function. */
 #undef HAVE_PREAD

-/* Define to 1 if you have the `pread64' function. */
+/* Define to 1 if you have the pread64() function. */
 #undef HAVE_PREAD64

-/* Define to 1 if you have the `pwrite' function. */
+/* Define to 1 if you have the pwrite() function. */
 #undef HAVE_PWRITE

-/* Define to 1 if you have the `pwrite64' function. */
+/* Define to 1 if you have the pwrite64() function. */
 #undef HAVE_PWRITE64

 /* Define to 1 if you have the <stdint.h> header file. */
@@ -63,7 +63,7 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H

-/* Define to 1 if you have the `strchrnul' function. */
+/* Define to 1 if you have the strchrnul() function */
 #undef HAVE_STRCHRNUL

 /* Define to 1 if you have the <strings.h> header file. */
@@ -99,12 +99,9 @@
 /* Define to 1 if you have the `usleep' function. */
 #undef HAVE_USLEEP

-/* Define to 1 if you have the `utime' function. */
+/* Define to 1 if you have the utime() library function. */
 #undef HAVE_UTIME

-/* Define to 1 if you have the <zlib.h> header file. */
-#undef HAVE_ZLIB_H
-
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
   */
 #undef LT_OBJDIR
@@ -121,20 +118,12 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME

-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS

-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS

@@ -11875,7 +11875,7 @@ fi

 #########
 # Output the config header
-ac_config_headers="$ac_config_headers sqlite_cfg.h"
+ac_config_headers="$ac_config_headers config.h"


 #########
@@ -12838,7 +12838,7 @@ for ac_config_target in $ac_config_targets
 do
  case $ac_config_target in
    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "sqlite_cfg.h") CONFIG_HEADERS="$CONFIG_HEADERS sqlite_cfg.h" ;;
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    "sqlite3.pc") CONFIG_FILES="$CONFIG_FILES sqlite3.pc" ;;

@@ -806,7 +806,7 @@ AC_SUBST(AMALGAMATION_LINE_MACROS)

 #########
 # Output the config header
-AC_CONFIG_HEADERS(sqlite_cfg.h)
+AC_CONFIG_HEADERS(config.h)

 #########
 # Generate the output files.
@@ -299,9 +299,8 @@ static void icuRegexpFunc(sqlite3_context *p, int nArg, sqlite3_value **apArg){

    if( U_SUCCESS(status) ){
      sqlite3_set_auxdata(p, 0, pExpr, icuRegexpDelete);
-      pExpr = sqlite3_get_auxdata(p, 0);
-    }
-    if( !pExpr ){
+    }else{
+      assert(!pExpr);
      icuFunctionError(p, "uregex_open", status);
      return;
    }
@@ -1,9 +1,9 @@
-C Code\sclean-up\sfor\sthe\sintegrity_check\senhancement.
-D 2022-10-10T21:21:04.220
+C Prototype\simplementation\sof\s"PRAGMA\sreset_database".\s\sThis\spragma\sdiffers\sfrom\nSQLITE_DBCONFIG_RESET_DATABASE\sin\sthat\sthe\spragma\sonly\sworks\sif\sthe\sdatabase\nis\sreasonably\swell-formed,\swhereas\sthe\sdbconfig\sworks\sregardless.
+D 2022-09-28T17:10:23.906
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 42efe1354fea12f5c68891939f7c7356353d345aaa7c73d36242499f9cf6e60f
+F Makefile.in 525bccb89e36a927f9312a231f054a2dc029f6af75901c7fc1a781d51b260323
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -32,9 +32,10 @@ F autoconf/tea/win/makefile.vc 2c478a9a962e48b2bf9062734e04d7c63c556e21709541917
 F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea00342d1a1a7eaa19cb
 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
+F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc
 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
-F configure b93755fe94b3e9b2015f3c2d6c63928e8899b0a7c54e042deb843498094179da x
-F configure.ac 48dc6bfee293eef05910faf085760f2fd79b680aa47b50e8e6a22ca40bb026bb
+F configure f959db96f314b3b91b3d658eebbc0a96b9542f1265c4de97e885aedb6bdcead5 x
+F configure.ac 3ef6eeff4387585bfcab76b0c3f6e15a0618587bb90245dd5d44e4378141bb35
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347bb123ce1ea4f
@@ -238,7 +239,7 @@ F ext/fts5/tool/loadfts5.tcl 95b03429ee6b138645703c6ca192c3ac96eaf093
 F ext/fts5/tool/mkfts5c.tcl 3eba8e9bee4221ed165f3304b51b2a74a705f4ec5df3d044573a2be539534af8
 F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
 F ext/icu/README.txt 7ab7ced8ae78e3a645b57e78570ff589d4c672b71370f5aa9e1cd7024f400fc9
-F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
+F ext/icu/icu.c 91c021c7e3e8bbba286960810fa303295c622e323567b2e6def4ce58e4466e60
 F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
 F ext/lsm1/Makefile a553b728bba6c11201b795188c5708915cc4290f02b7df6ba7e8c4c943fd5cd9
 F ext/lsm1/Makefile.msc f8c878b467232226de288da320e1ac71c131f5ec91e08b21f502303347260013
@@ -520,7 +521,6 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2
 F src/alter.c 0390ca1d69ec3626cfa9f153114b7ab233e6b2bada6a9eb91361ed385fe90deb
 F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467
 F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
@@ -528,13 +528,13 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c 74fc5f6a0577df703d6f98d0c51ee0d8d91d22dbc0ba86e42e056517e2b45576
+F src/btree.c 55688477058bb5733128e5d2ff385c58ea82d198ba8a90aeef087946343d9445
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
-F src/build.c 6e3ee380a4f0ff95de4b53bf510f66600cff08e4e04b92e95fae789072563f8f
+F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
-F src/ctime.c 428b47a2548c7c2c2f885189b42fdcc178fb03c276a2d58b3008b10da29373d5
+F src/ctime.c 93e4b5f4faf6d3f688988a116773259a4fbfb4ddac0e9bf9d0ae0429390c2543
 F src/date.c 94ce83b4cd848a387680a5f920c9018c16655db778c4d36525af0a0f34679ac5
 F src/dbpage.c 5808e91bc27fa3981b028000f8fadfdc10ce9e59a34ce7dc4e035a69be3906ec
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
@@ -568,7 +568,7 @@ F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
 F src/mutex_unix.c dd2b3f1cc1863079bc1349ac0fec395a500090c4fe4e11ab775310a49f2f956d
 F src/mutex_w32.c caa50e1c0258ac4443f52e00fe8aaea73b6d0728bd8856bedfff822cae418541
 F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6
-F src/os.c 81c9c1c52eab711e27e33fd51fe5788488d3a02bc1a71439857abbee5d0d2c97
+F src/os.c 0eb831ba3575af5277e47f4edd14fdfc90025c67eb25ce5cda634518d308d4e9
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
@@ -581,19 +581,19 @@ F src/parse.y 8e67d820030d2655b9942ffe61c1e7e6b96cea2f2f72183533299393907d0564
 F src/pcache.c f4268f7f73c6a3db12ce22fd25bc68dc42315d19599414ab1207d7cf32f79197
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
-F src/pragma.c 444f596c9e9123d19451ad762917f0f7545e4acecb10f67e09a19f01289cefce
-F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
-F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
+F src/pragma.c 7a66d429ac95147809b496b0129636a4ed2913355da5868be990090861c97f27
+F src/pragma.h 05e527d0aef2e9fcf4854cd7af1a852c3d3f316936000e4968298ac1dd570a34
+F src/prepare.c 1730581972370ba6f7ce3ce713492d6bb21ae801cb566817540db1b3b46e8b82
 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
 F src/shell.c.in e7e7c2c69ae86c5ee9e8ad66227203d46ff6dce8700a1b1dababff01c71d33df
-F src/sqlite.h.in bcc51bb43c54676dccbad07051c6d463212707f50363d64f1831440749e91ddb
+F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
-F src/sqliteInt.h 1d27d00dcaafed614d6ed8738d6c41a81acf12fe50fe4c677427b1c56d8a81da
+F src/sqliteInt.h 7bba148584fdbc11f32dbdffaeb97f7957646aedec9ae27b3d9e6d03d9facd58
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 160c445d7d28c984a0eae38c144f6419311ed3eace59b44ac6dafc20db4af749
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -615,7 +615,7 @@ F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31
 F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 F src/test_config.c 8264637b06a3c1f0727c88d1ea32dcf7986b9e7e358a970cae87cdac8a5b2708
 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
-F src/test_demovfs.c 7cc7623d1025d1e92c51da20fd25060759733b7a356a121545a3b7d2faa8a0f1
+F src/test_demovfs.c 86142ba864d4297d54c5b2e972e74f3141ae4b30f05b3a95824184ed2d3d7f91
 F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593
 F src/test_fs.c ba1e1dc18fd3159fdba0b9c4256f14032159785320dfbd6776eb9973cb75d480
 F src/test_func.c 24df3a346c012b1fc9e1001d346db6054deb426db0a7437e92490630e71c9b0a
@@ -654,19 +654,19 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 1305797eab3542a0896b552c6e7669c972c1468e11e92b370533c1f37a37082b
 F src/treeview.c 07787f67cd297a6d09d04b8d70c06769c60c9c1d9080378f93929c16f8fd3298
-F src/trigger.c 4163ada044af89d51caba1cb713a73165347b2ec05fe84a283737c134d61fcd5
-F src/update.c 5b0302c47cf31b533d5dff04c497ca1d8b9d89c39727e633fbe7b882fd5ac5aa
+F src/trigger.c bc70c58e713dcfb6cabe5cc0bed71aedb02c3e9e128c6089a78aca945ba4d720
+F src/update.c c52a7991bece0453d22c77c08469512ee2f1391c12503fd347d1c939220c5877
 F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
-F src/vacuum.c bb346170b0b54c6683bba4a5983aea40485597fdf605c87ec8bc2e199fe88cd8
-F src/vdbe.c 387270d575129b0c6ab0d19dad6de5abc1576ce6cc97f30d233ee13775ea4527
+F src/vacuum.c 7d641f22e047bc033d577cef75146f445a88ac23785e5131e74f053c6215f69a
+F src/vdbe.c 57004f80fc2a7d45473a6c83cc18dc9a362f5d218f10dff740f1f6e3246b2b50
 F src/vdbe.h 64619af62603dc3c4f5ff6ff6d2c8f389abd667a29ce6007ed44bd22b3211cd0
 F src/vdbeInt.h 17b7461ffcf9ee760d1341731715a419f6b8c763089a7ece25c2e8098d702b3f
 F src/vdbeapi.c fc3183daf72808b4311b228989120fdbc2dc44972fb0d77d5c453460cc0e5b2c
 F src/vdbeaux.c c719cebaffa75e166f16a405b3dee96e7150d60fc563ab2dea716b60c6a51312
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
-F src/vdbemem.c a9a3556bbdc8f3022f75136054c3ed02cbac15a73ec55cff2ea27bf5bb773dcc
+F src/vdbemem.c c3ce80af15e2ff5c2824a8db881681cbf511376f13613da020bac6d320c535b1
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@ -677,7 +677,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 63e712bcad47f70e94c2150976cd7da5040933699e3938d4189d064acbe40891
 F src/whereInt.h 70cd30de9ed784aa33fa6bd1245f060617de7a00d992469b6d8e419eed915743
-F src/wherecode.c bb88be457df3a6a01c844074ab79a9ba74279e73185f1362383aa697e3cae5dc
+F src/wherecode.c 6bb1cf9d0a4e3e04dab0bf0ea4a8d936a0dcc05a7e2207beeda6c61aea6dd341
 F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
 F src/window.c 928e215840e2f2d9a2746e018c9643ef42c66c4ab6630ef0df7fa388fa145e86
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -781,7 +781,6 @@ F test/bind2.test 918bc35135f4141809ead7585909cde57d44db90a7a62aef540127148f91aa
 F test/bindxfer.test efecd12c580c14df5f4ad3b3e83c667744a4f7e0
 F test/bitvec.test 75894a880520164d73b1305c1c3f96882615e142
 F test/blob.test e7ac6c7d3a985cc4678c64f325292529a69ae252
-F test/bloom1.test 5318eb0648dff073ca9b9a54387ec2c0a7a07ed3490461fe2db0d074b2eb0e7f
 F test/boundary1.tcl 6421b2d920d8b09539503a8673339d32f7609eb1
 F test/boundary1.test 66d7f4706ccdb42d58eafdb081de07b0eb42d77b
 F test/boundary2.tcl e34ef4e930cf1083150d4d2c603e146bd3b76bcb
@@ -1113,7 +1112,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4
 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2
-F test/fuzzdata8.db 653423800b7671e67caa740e977d80e1360f0d69e9992851f3ea5c4a69a2724a
+F test/fuzzdata8.db ca9a97f401b06b0d5376139ec7e1f9e773e13345a9a2d9ccc0032cdbfedea230
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
@@ -1262,7 +1261,7 @@ F test/memdb1.test 2c4e9cc10d21c6bf4e217d72b7f6b8ba9b2605971bb2c5e6df76018e189f9
 F test/memjournal.test 70f3a00c7f84ee2978ad14e831231caa1e7f23915a2c54b4f775a021d5740c6c
 F test/memjournal2.test 6b9083cfaab9a3281ec545c3da2487999e8025fb7501bbae10f713f80c56454c
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
-F test/memsubsys1.test 86b8158752af9188ed5b32a30674a1ef71183e6bc4e6808e815cd658ca9058a6
+F test/memsubsys1.test 9e7555a22173b8f1c96c281ce289b338fcba2abe8b157f8798ca195bbf1d347e
 F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
 F test/merge1.test 2de6d6ef8d25402764b1aab49d8f9d7f89208c89a6674e437f76de4c812157b8
 F test/minmax.test fe638b55d77d2375531a8f549b338eafcd9adfbd2f72df37ed77d9b26ca0a71a
@@ -1408,7 +1407,6 @@ F test/schema6.test e4bd1f23d368695eb9e7b51ef6e02ca0642ea2ab4a52579959826b5e7dce
 F test/schemafault.test 1936bceca55ac82c5efbcc9fc91a1933e45c8d1e1d106b9a7e56c972a5a2a51e
 F test/securedel.test 2f70b2449186a1921bd01ec9da407fbfa98c3a7a5521854c300c194b2ff09384
 F test/securedel2.test 2d54c28e46eb1fd6902089958b20b1b056c6f1c5
-F test/seekscan1.test d79c97de5bb1dd1fd466687f3014add514fddf8248c57baf51d749c7dfd573d8
 F test/select1.test 692e84cfa29c405854c69e8a4027183d64c22952866a123fabbce741a379e889
 F test/select2.test 352480e0e9c66eda9c3044e412abdf5be0215b56
 F test/select3.test 8d04b66df7475275a65f7e4a786d6a724c30bd9929f8ae5bd59c8d3d6e75e6cd
@@ -1482,7 +1480,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 8677e29942ed0b8b5212e46c05e3debfe48bcaaebde4aa8ddc797cd73b8937d2
+F test/speedtest1.c 8bf7ebac9ac316feed6656951249db531dc380c73fb3e3b22e224ffda96beff6
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -1928,13 +1926,13 @@ F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-F tool/mkctimec.tcl 0e309dfc8bb01cd385deeb010df4ca76dee3ab4e8ec0588233b3f152679122e8 x
+F tool/mkctimec.tcl 8f472681f6041cf0ec26a1799feda39e55370614a6090d66fa5044f9f52d22c6 x
 F tool/mkkeywordhash.c 35bfc41adacc4aa6ef6fca7fd0c63e0ec0534b78daf4d0cfdebe398216bbffc3
 F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33
 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
 F tool/mkopcodeh.tcl bcb2bd5affb545fd219ef0304c7978e2a356407ab723f45ec8569235892c1c3f
 F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
-F tool/mkpragmatab.tcl bd07bd59d45d0f3448e123d6937e9811195f9908a51e09d774609883055bfd3d
+F tool/mkpragmatab.tcl cb827237c3184697c8335ff427085a31c1ac1ce18f5cdf893c9dfad78c98f3b1
 F tool/mkshellc.tcl df5d249617f9cc94d5c48eb0401673eb3f31f383ecbc54e8a13ca3dd97e89450
 F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@ -2002,8 +2000,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P dbab9d52a842085da67f5d0b8e96c665adc16331accf380b4c234e9b05bdb7fb
-R 27cc3a1e54ea78f4322ce43e3f2008e7
+P 584de6a996c78b8e41bdfcd05a8e2a3844664c6b4efedb5883c8b8af388462b5
+R df3dd3e3ab8a07ab9eb6697e699f0af2
+T *branch * reset-database
+T *sym-reset-database *
+T -sym-trunk *
 U drh
-Z 5bcdf356b09ea5213e990a91977b44f5
+Z 8ce23413b5db3390219d6d34f63e62a0
 # Remove this line to create a well-formed Fossil manifest.
@@ -1 +1 @@
-a140173102febe9ef8064ee9b95bee489db54caba149e577d69e4d75161bf390
+cf0999d4f8fd120c4796240600cd42fcc8baa056efad432d0dae7da372023787
@@ -3502,16 +3502,16 @@ int sqlite3BtreeBeginTrans(Btree *p, int wrflag, int *pSchemaVersion){
  }
  assert( pBt->inTransaction==TRANS_WRITE || IfNotOmitAV(pBt->bDoTruncate)==0 );

-  if( (p->db->flags & SQLITE_ResetDatabase) 
-   && sqlite3PagerIsreadonly(pPager)==0 
-  ){
-    pBt->btsFlags &= ~BTS_READ_ONLY;
-  }
-
  /* Write transactions are not possible on a read-only database */
  if( (pBt->btsFlags & BTS_READ_ONLY)!=0 && wrflag ){
-    rc = SQLITE_READONLY;
-    goto trans_begun;
+    if( (p->db->flags & SQLITE_ResetDatabase) 
+     && sqlite3PagerIsreadonly(pPager)==0 
+    ){
+      pBt->btsFlags &= ~BTS_READ_ONLY;
+    }else{
+      rc = SQLITE_READONLY;
+      goto trans_begun;
+    }
  }

 #ifndef SQLITE_OMIT_SHARED_CACHE
@@ -3743,9 +3743,6 @@ static int modifyPagePointer(MemPage *pPage, Pgno iFrom, Pgno iTo, u8 eType){
          }
        }
      }else{
-        if( pCell+4 > pPage->aData+pPage->pBt->usableSize ){
-          return SQLITE_CORRUPT_PAGE(pPage);
-        }
        if( get4byte(pCell)==iFrom ){
          put4byte(pCell, iTo);
          break;
@@ -6080,7 +6077,14 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){

  pPage = pCur->pPage;
  idx = ++pCur->ix;
-  if( NEVER(!pPage->isInit) || sqlite3FaultSim(412) ){
+  if( !pPage->isInit || sqlite3FaultSim(412) ){
+    /* The only known way for this to happen is for there to be a
+    ** recursive SQL function that does a DELETE operation as part of a
+    ** SELECT which deletes content out from under an active cursor
+    ** in a corrupt database file where the table being DELETE-ed from
+    ** has pages in common with the table being queried.  See TH3
+    ** module cov1/btree78.test testcase 220 (2018-06-08) for an
+    ** example. */
    return SQLITE_CORRUPT_BKPT;
  }

@@ -8770,11 +8774,6 @@ static int balance(BtCursor *pCur){
      }else{
        break;
      }
-    }else if( sqlite3PagerPageRefcount(pPage->pDbPage)>1 ){
-      /* The page being written is not a root page, and there is currently
-      ** more than one reference to it. This only happens if the page is one 
-      ** of its own ancestor pages. Corruption. */
-      rc = SQLITE_CORRUPT_BKPT;
    }else{
      MemPage * const pParent = pCur->apPage[iPage-1];
      int const iIdx = pCur->aiIdx[iPage-1];
@@ -453,7 +453,7 @@ Table *sqlite3LocateTable(
    /* If zName is the not the name of a table in the schema created using
    ** CREATE, then check to see if it is the name of an virtual table that
    ** can be an eponymous virtual table. */
-    if( (pParse->prepFlags & SQLITE_PREPARE_NO_VTAB)==0 && db->init.busy==0 ){
+    if( pParse->disableVtab==0 && db->init.busy==0 ){
      Module *pMod = (Module*)sqlite3HashFind(&db->aModule, zName);
      if( pMod==0 && sqlite3_strnicmp(zName, "pragma_", 7)==0 ){
        pMod = sqlite3PragmaVtabRegister(db, zName);
@@ -466,7 +466,7 @@ Table *sqlite3LocateTable(
 #endif
    if( flags & LOCATE_NOERR ) return 0;
    pParse->checkSchema = 1;
-  }else if( IsVirtual(p) && (pParse->prepFlags & SQLITE_PREPARE_NO_VTAB)!=0 ){
+  }else if( IsVirtual(p) && pParse->disableVtab ){
    p = 0;
  }

@@ -28,7 +28,7 @@
 ** autoconf-based build
 */
 #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
-#include "sqlite_cfg.h"
+#include "config.h"
 #define SQLITECONFIG_H 1
 #endif

@@ -106,11 +106,9 @@ int sqlite3OsFileSize(sqlite3_file *id, i64 *pSize){
 }
 int sqlite3OsLock(sqlite3_file *id, int lockType){
  DO_OS_MALLOC_TEST(id);
-  assert( lockType>=SQLITE_LOCK_SHARED && lockType<=SQLITE_LOCK_EXCLUSIVE );
  return id->pMethods->xLock(id, lockType);
 }
 int sqlite3OsUnlock(sqlite3_file *id, int lockType){
-  assert( lockType==SQLITE_LOCK_NONE || lockType==SQLITE_LOCK_SHARED );
  return id->pMethods->xUnlock(id, lockType);
 }
 int sqlite3OsCheckReservedLock(sqlite3_file *id, int *pResOut){
@@ -1752,9 +1752,8 @@ void sqlite3Pragma(
        int loopTop;
        int iDataCur, iIdxCur;
        int r1 = -1;
-        int bStrict;            /* True for a STRICT table */
+        int bStrict;
        int r2;                 /* Previous key for WITHOUT ROWID tables */
-        int mxCol;              /* Maximum non-virtual column number */

        if( !IsOrdinaryTable(pTab) ) continue;
        if( pObjTab && pObjTab!=pTab ) continue;
@@ -1779,24 +1778,11 @@ void sqlite3Pragma(
        assert( sqlite3NoTempsInRange(pParse,1,7+j) );
        sqlite3VdbeAddOp2(v, OP_Rewind, iDataCur, 0); VdbeCoverage(v);
        loopTop = sqlite3VdbeAddOp2(v, OP_AddImm, 7, 1);
-
-        /* Fetch the right-most column from the table.  This will cause
-        ** the entire record header to be parsed and sanity checked.  It
-        ** will also prepopulate the cursor column cache that is used
-        ** by the OP_IsType code, so it is a required step.
-        */
-        mxCol = pTab->nCol-1;
-        while( mxCol>=0
-            && ((pTab->aCol[mxCol].colFlags & COLFLAG_VIRTUAL)!=0
-                || pTab->iPKey==mxCol) ) mxCol--;
-        if( mxCol>=0 ){
-          sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, mxCol, 3);
-          if( sqlite3VdbeGetLastOp(v)->opcode==OP_Column ){
-            sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
-          }
-        }
-
        if( !isQuick ){
+          /* Sanity check on record header decoding */
+          sqlite3VdbeAddOp3(v, OP_Column, iDataCur, pTab->nNVCol-1,3);
+          sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
+          VdbeComment((v, "(right-most column)"));
          if( pPk ){
            /* Verify WITHOUT ROWID keys are in ascending order */
            int a1;
@@ -1816,122 +1802,44 @@ void sqlite3Pragma(
            }
          }
        }
-        /* Verify datatypes for all columns:
-        **
-        **   (1) NOT NULL columns may not contain a NULL
-        **   (2) Datatype must be exact for non-ANY columns in STRICT tables
-        **   (3) Datatype for TEXT columns in non-STRICT tables must be
-        **       NULL, TEXT, or BLOB.
-        **   (4) Datatype for numeric columns in non-STRICT tables must not
-        **       be a TEXT value that can be losslessly converted to numeric.
-        */
+        /* Verify that all NOT NULL columns really are NOT NULL.  At the
+        ** same time verify the type of the content of STRICT tables */
        bStrict = (pTab->tabFlags & TF_Strict)!=0;
        for(j=0; j<pTab->nCol; j++){
          char *zErr;
-          Column *pCol = pTab->aCol + j;  /* The column to be checked */
-          int labelError;               /* Jump here to report an error */
-          int labelOk;                  /* Jump here if all looks ok */
-          int p1, p3, p4;               /* Operands to the OP_IsType opcode */
-          int doTypeCheck;              /* Check datatypes (besides NOT NULL) */
-
+          Column *pCol = pTab->aCol + j;
+          int doError, jmp2;
          if( j==pTab->iPKey ) continue;
-          if( bStrict ){
-            doTypeCheck = pCol->eCType>COLTYPE_ANY;
-          }else{
-            doTypeCheck = pCol->affinity>SQLITE_AFF_BLOB;
+          if( pCol->notNull==0 && !bStrict ) continue;
+          doError = bStrict ? sqlite3VdbeMakeLabel(pParse) : 0;
+          sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
+          if( sqlite3VdbeGetLastOp(v)->opcode==OP_Column ){
+            sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
          }
-          if( pCol->notNull==0 && !doTypeCheck ) continue;
-
-          /* Compute the operands that will be needed for OP_IsType */
-          p4 = SQLITE_NULL;
-          if( pCol->colFlags & COLFLAG_VIRTUAL ){
-            sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
-            p1 = -1;
-            p3 = 3;
-          }else{
-            if( pCol->iDflt ){
-              sqlite3_value *pDfltValue = 0;
-              sqlite3ValueFromExpr(db, sqlite3ColumnExpr(pTab,pCol), ENC(db),
-                                   pCol->affinity, &pDfltValue);
-              if( pDfltValue ){
-                p4 = sqlite3_value_type(pDfltValue);
-                sqlite3ValueFree(pDfltValue);
-              }
-            }
-            p1 = iDataCur;
-            if( !HasRowid(pTab) ){
-              testcase( j!=sqlite3TableColumnToStorage(pTab, j) );
-              p3 = sqlite3TableColumnToIndex(sqlite3PrimaryKeyIndex(pTab), j);
-            }else{
-              p3 = sqlite3TableColumnToStorage(pTab,j);
-              testcase( p3!=j);
-            }
-          }
-
-          labelError = sqlite3VdbeMakeLabel(pParse);
-          labelOk = sqlite3VdbeMakeLabel(pParse);
          if( pCol->notNull ){
-            /* (1) NOT NULL columns may not contain a NULL */
-            int jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
-            sqlite3VdbeChangeP5(v, 0x0f);
-            VdbeCoverage(v);
+            jmp2 = sqlite3VdbeAddOp1(v, OP_NotNull, 3); VdbeCoverage(v);
            zErr = sqlite3MPrintf(db, "NULL value in %s.%s", pTab->zName,
                                pCol->zCnName);
            sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
-            if( doTypeCheck ){
-              sqlite3VdbeGoto(v, labelError);
-              sqlite3VdbeJumpHere(v, jmp2);
+            if( bStrict && pCol->eCType!=COLTYPE_ANY ){
+              sqlite3VdbeGoto(v, doError);
            }else{
-              /* VDBE byte code will fall thru */
+              integrityCheckResultRow(v);
            }
+            sqlite3VdbeJumpHere(v, jmp2);
          }
-          if( bStrict && doTypeCheck ){
-            /* (2) Datatype must be exact for non-ANY columns in STRICT tables*/
-            static unsigned char aStdTypeMask[] = {
-               0x1f,    /* ANY */
-               0x18,    /* BLOB */
-               0x11,    /* INT */
-               0x11,    /* INTEGER */
-               0x13,    /* REAL */
-               0x14     /* TEXT */
-            };
-            sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
-            assert( pCol->eCType>=1 && pCol->eCType<=sizeof(aStdTypeMask) );
-            sqlite3VdbeChangeP5(v, aStdTypeMask[pCol->eCType-1]);
+          if( bStrict && pCol->eCType!=COLTYPE_ANY ){
+            jmp2 = sqlite3VdbeAddOp3(v, OP_IsNullOrType, 3, 0, 
+                                     sqlite3StdTypeMap[pCol->eCType-1]);
            VdbeCoverage(v);
            zErr = sqlite3MPrintf(db, "non-%s value in %s.%s",
                                  sqlite3StdType[pCol->eCType-1],
                                  pTab->zName, pTab->aCol[j].zCnName);
            sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
-          }else if( !bStrict && pCol->affinity==SQLITE_AFF_TEXT ){
-            /* (3) Datatype for TEXT columns in non-STRICT tables must be
-            **     NULL, TEXT, or BLOB. */
-            sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
-            sqlite3VdbeChangeP5(v, 0x1c); /* NULL, TEXT, or BLOB */
-            VdbeCoverage(v);
-            zErr = sqlite3MPrintf(db, "NUMERIC value in %s.%s",
-                                  pTab->zName, pTab->aCol[j].zCnName);
-            sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
-          }else if( !bStrict && pCol->affinity>=SQLITE_AFF_NUMERIC ){
-            /* (4) Datatype for numeric columns in non-STRICT tables must not
-            **     be a TEXT value that can be converted to numeric. */
-            sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
-            sqlite3VdbeChangeP5(v, 0x1b); /* NULL, INT, FLOAT, or BLOB */
-            VdbeCoverage(v);
-            if( p1>=0 ){
-              sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
-            }
-            sqlite3VdbeAddOp4(v, OP_Affinity, 3, 1, 0, "C", P4_STATIC);
-            sqlite3VdbeAddOp4Int(v, OP_IsType, -1, labelOk, 3, p4);
-            sqlite3VdbeChangeP5(v, 0x1c); /* NULL, TEXT, or BLOB */
-            VdbeCoverage(v);
-            zErr = sqlite3MPrintf(db, "TEXT value in %s.%s",
-                                  pTab->zName, pTab->aCol[j].zCnName);
-            sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
+            sqlite3VdbeResolveLabel(v, doError);
+            integrityCheckResultRow(v);
+            sqlite3VdbeJumpHere(v, jmp2);
          }
-          sqlite3VdbeResolveLabel(v, labelError);
-          integrityCheckResultRow(v);
-          sqlite3VdbeResolveLabel(v, labelOk);
        }
        /* Verify CHECK constraints */
        if( pTab->pCheck && (db->flags & SQLITE_IgnoreChecks)==0 ){
@@ -2477,6 +2385,20 @@ void sqlite3Pragma(
    break;
  }

+#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
+  /*
+  **   PRAGMA schema.reset_database
+  **   PRAGMA reset_database
+  **
+  ** Remove all content from a database file.  Bring the size of the
+  ** file back to zero.
+  */
+  case PragTyp_RESET_DATABASE: {
+    sqlite3VdbeAddOp3(v, OP_Vacuum, iDb, 0, 1);
+    break;
+  }
+#endif
+
 #if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
  /*
  ** Report the current state of file logs for all databases
@@ -38,19 +38,20 @@
 #define PragTyp_OPTIMIZE                      30
 #define PragTyp_PAGE_SIZE                     31
 #define PragTyp_PRAGMA_LIST                   32
-#define PragTyp_SECURE_DELETE                 33
-#define PragTyp_SHRINK_MEMORY                 34
-#define PragTyp_SOFT_HEAP_LIMIT               35
-#define PragTyp_SYNCHRONOUS                   36
-#define PragTyp_TABLE_INFO                    37
-#define PragTyp_TABLE_LIST                    38
-#define PragTyp_TEMP_STORE                    39
-#define PragTyp_TEMP_STORE_DIRECTORY          40
-#define PragTyp_THREADS                       41
-#define PragTyp_WAL_AUTOCHECKPOINT            42
-#define PragTyp_WAL_CHECKPOINT                43
-#define PragTyp_LOCK_STATUS                   44
-#define PragTyp_STATS                         45
+#define PragTyp_RESET_DATABASE                33
+#define PragTyp_SECURE_DELETE                 34
+#define PragTyp_SHRINK_MEMORY                 35
+#define PragTyp_SOFT_HEAP_LIMIT               36
+#define PragTyp_SYNCHRONOUS                   37
+#define PragTyp_TABLE_INFO                    38
+#define PragTyp_TABLE_LIST                    39
+#define PragTyp_TEMP_STORE                    40
+#define PragTyp_TEMP_STORE_DIRECTORY          41
+#define PragTyp_THREADS                       42
+#define PragTyp_WAL_AUTOCHECKPOINT            43
+#define PragTyp_WAL_CHECKPOINT                44
+#define PragTyp_LOCK_STATUS                   45
+#define PragTyp_STATS                         46

 /* Property flags associated with various pragma. */
 #define PragFlg_NeedSchema 0x01 /* Force schema load before running */
@@ -500,6 +501,15 @@ static const PragmaName aPragmaName[] = {
  /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
  /* ColNames:  */ 0, 0,
  /* iArg:      */ SQLITE_RecTriggers },
+#endif
+#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
+ {/* zName:     */ "reset_database",
+  /* ePragTyp:  */ PragTyp_RESET_DATABASE,
+  /* ePragFlg:  */ 0,
+  /* ColNames:  */ 0, 0,
+  /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
 {/* zName:     */ "reverse_unordered_selects",
  /* ePragTyp:  */ PragTyp_FLAG,
  /* ePragFlg:  */ PragFlg_Result0|PragFlg_NoColumns1,
@@ -657,4 +667,4 @@ static const PragmaName aPragmaName[] = {
  /* iArg:      */ SQLITE_WriteSchema|SQLITE_NoSchemaError },
 #endif
 };
-/* Number of pragmas: 68 on by default, 78 total. */
+/* Number of pragmas: 69 on by default, 79 total. */
@@ -286,9 +286,6 @@ int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg, u32 mFlags){
  for(i=0; i<ArraySize(meta); i++){
    sqlite3BtreeGetMeta(pDb->pBt, i+1, (u32 *)&meta[i]);
  }
-  if( (db->flags & SQLITE_ResetDatabase)!=0 ){
-    memset(meta, 0, sizeof(meta));
-  }
  pDb->pSchema->schema_cookie = meta[BTREE_SCHEMA_VERSION-1];

  /* If opening a non-empty database, check the text encoding. For the
@@ -705,7 +702,7 @@ static int sqlite3Prepare(
    sParse.disableLookaside++;
    DisableLookaside;
  }
-  sParse.prepFlags = prepFlags & 0xff;
+  sParse.disableVtab = (prepFlags & SQLITE_PREPARE_NO_VTAB)!=0;

  /* Check to verify that it is possible to get a read lock on all
  ** database schemas.  The inability to get a read lock indicates that
@@ -746,9 +743,7 @@ static int sqlite3Prepare(
    }
  }

-#ifndef SQLITE_OMIT_VIRTUALTABLE
-  if( db->pDisconnect ) sqlite3VtabUnlockList(db);
-#endif
+  sqlite3VtabUnlockList(db);

  if( nBytes>=0 && (nBytes==0 || zSql[nBytes-1]!=0) ){
    char *zSqlCopy;
@@ -670,17 +670,13 @@ int sqlite3_exec(
 **
 ** SQLite uses one of these integer values as the second
 ** argument to calls it makes to the xLock() and xUnlock() methods
-** of an [sqlite3_io_methods] object.  These values are ordered from
-** lest restrictive to most restrictive.
-**
-** The argument to xLock() is always SHARED or higher.  The argument to
-** xUnlock is either SHARED or NONE.
+** of an [sqlite3_io_methods] object.
 */
-#define SQLITE_LOCK_NONE          0       /* xUnlock() only */
-#define SQLITE_LOCK_SHARED        1       /* xLock() or xUnlock() */
-#define SQLITE_LOCK_RESERVED      2       /* xLock() only */
-#define SQLITE_LOCK_PENDING       3       /* xLock() only */
-#define SQLITE_LOCK_EXCLUSIVE     4       /* xLock() only */
+#define SQLITE_LOCK_NONE          0
+#define SQLITE_LOCK_SHARED        1
+#define SQLITE_LOCK_RESERVED      2
+#define SQLITE_LOCK_PENDING       3
+#define SQLITE_LOCK_EXCLUSIVE     4

 /*
 ** CAPI3REF: Synchronization Type Flags
@@ -758,14 +754,7 @@ struct sqlite3_file {
 ** <li> [SQLITE_LOCK_PENDING], or
 ** <li> [SQLITE_LOCK_EXCLUSIVE].
 ** </ul>
-** xLock() upgrades the database file lock.  In other words, xLock() moves the
-** database file lock in the direction NONE toward EXCLUSIVE. The argument to
-** xLock() is always on of SHARED, RESERVED, PENDING, or EXCLUSIVE, never
-** SQLITE_LOCK_NONE.  If the database file lock is already at or above the
-** requested lock, then the call to xLock() is a no-op.
-** xUnlock() downgrades the database file lock to either SHARED or NONE.
-*  If the lock is already at or below the requested lock state, then the call
-** to xUnlock() is a no-op. 
+** xLock() increases the lock. xUnlock() decreases the lock.
 ** The xCheckReservedLock() method checks whether any database connection,
 ** either in this process or in some other process, is holding a RESERVED,
 ** PENDING, or EXCLUSIVE lock on the file.  It returns true
@@ -870,8 +859,9 @@ struct sqlite3_io_methods {
 ** opcode causes the xFileControl method to write the current state of
 ** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
 ** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
-** into an integer that the pArg argument points to.
-** This capability is only available if SQLite is compiled with [SQLITE_DEBUG].
+** into an integer that the pArg argument points to. This capability
+** is used during testing and is only available when the SQLITE_TEST
+** compile-time option is used.
 **
 ** <li>[[SQLITE_FCNTL_SIZE_HINT]]
 ** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS
@@ -5638,7 +5628,7 @@ void sqlite3_value_free(sqlite3_value*);
 **
 ** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer 
 ** when first called if N is less than or equal to zero or if a memory
-** allocation error occurs.
+** allocate error occurs.
 **
 ** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
 ** determined by the N parameter on first successful call.  Changing the
@@ -208,7 +208,7 @@
 ** autoconf-based build
 */
 #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
-#include "sqlite_cfg.h"
+#include "config.h"
 #define SQLITECONFIG_H 1
 #endif

@@ -3604,7 +3604,7 @@ struct Parse {
  u8 hasCompound;      /* Need to invoke convertCompoundSelectToSubquery() */
  u8 okConstFactor;    /* OK to factor out constants */
  u8 disableLookaside; /* Number of times lookaside has been disabled */
-  u8 prepFlags;        /* SQLITE_PREPARE_* flags */
+  u8 disableVtab;      /* Disable all virtual tables for this parse */
  u8 withinRJSubrtn;   /* Nesting level for RIGHT JOIN body subroutines */
 #if defined(SQLITE_DEBUG) || defined(SQLITE_COVERAGE_TEST)
  u8 earlyCleanup;     /* OOM inside sqlite3ParserAddCleanup() */
@@ -4739,7 +4739,7 @@ Index *sqlite3FindIndex(sqlite3*,const char*, const char*);
 void sqlite3UnlinkAndDeleteTable(sqlite3*,int,const char*);
 void sqlite3UnlinkAndDeleteIndex(sqlite3*,int,const char*);
 void sqlite3Vacuum(Parse*,Token*,Expr*);
-int sqlite3RunVacuum(char**, sqlite3*, int, sqlite3_value*);
+int sqlite3RunVacuum(char**, sqlite3*, int, sqlite3_value*, int);
 char *sqlite3NameFromToken(sqlite3*, const Token*);
 int sqlite3ExprCompare(const Parse*,const Expr*,const Expr*, int);
 int sqlite3ExprCompareSkip(Expr*,Expr*,int);
@@ -462,23 +462,21 @@ static int demoDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
  if( rc==0 && dirSync ){
    int dfd;                      /* File descriptor open on directory */
    int i;                        /* Iterator variable */
-    char *zSlash;
    char zDir[MAXPATHNAME+1];     /* Name of directory containing file zPath */

    /* Figure out the directory name from the path of the file deleted. */
    sqlite3_snprintf(MAXPATHNAME, zDir, "%s", zPath);
    zDir[MAXPATHNAME] = '\0';
-    zSlash = strrchr(zDir,'/');
-    if( zSlash ){
-      /* Open a file-descriptor on the directory. Sync. Close. */
-      zSlash[0] = 0;
-      dfd = open(zDir, O_RDONLY, 0);
-      if( dfd<0 ){
-        rc = -1;
-      }else{
-        rc = fsync(dfd);
-        close(dfd);
-      }
+    for(i=strlen(zDir); i>1 && zDir[i]!='/'; i++);
+    zDir[i] = '\0';
+
+    /* Open a file-descriptor on the directory. Sync. Close. */
+    dfd = open(zDir, O_RDONLY, 0);
+    if( dfd<0 ){
+      rc = -1;
+    }else{
+      rc = fsync(dfd);
+      close(dfd);
    }
  }
  return (rc==0 ? SQLITE_OK : SQLITE_IOERR_DELETE);
@@ -1191,7 +1191,7 @@ static TriggerPrg *codeRowTrigger(
  sSubParse.zAuthContext = pTrigger->zName;
  sSubParse.eTriggerOp = pTrigger->op;
  sSubParse.nQueryLoop = pParse->nQueryLoop;
-  sSubParse.prepFlags = pParse->prepFlags;
+  sSubParse.disableVtab = pParse->disableVtab;

  v = sqlite3GetVdbe(&sSubParse);
  if( v ){
@@ -59,14 +59,11 @@ static void updateVirtualTable(
 ** it has been converted into REAL.
 */
 void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i, int iReg){
-  Column *pCol;
  assert( pTab!=0 );
-  assert( pTab->nCol>i );
-  pCol = &pTab->aCol[i];
-  if( pCol->iDflt ){
+  if( !IsView(pTab) ){
    sqlite3_value *pValue = 0;
    u8 enc = ENC(sqlite3VdbeDb(v));
-    assert( !IsView(pTab) );
+    Column *pCol = &pTab->aCol[i];
    VdbeComment((v, "%s.%s", pTab->zName, pCol->zCnName));
    assert( i<pTab->nCol );
    sqlite3ValueFromExpr(sqlite3VdbeDb(v), 
@@ -77,7 +74,7 @@ void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i, int iReg){
    }
  }
 #ifndef SQLITE_OMIT_FLOATING_POINT
-  if( pCol->affinity==SQLITE_AFF_REAL && !IsVirtual(pTab) ){
+  if( pTab->aCol[i].affinity==SQLITE_AFF_REAL && !IsVirtual(pTab) ){
    sqlite3VdbeAddOp1(v, OP_RealAffinity, iReg);
  }
 #endif
@@ -144,7 +144,8 @@ SQLITE_NOINLINE int sqlite3RunVacuum(
  char **pzErrMsg,        /* Write error message here */
  sqlite3 *db,            /* Database connection */
  int iDb,                /* Which attached DB to vacuum */
-  sqlite3_value *pOut     /* Write results here, if not NULL. VACUUM INTO */
+  sqlite3_value *pOut,    /* Write results here, if not NULL. VACUUM INTO */
+  int bReset              /* Reset the database if true */
 ){
  int rc = SQLITE_OK;     /* Return code from service routines */
  Btree *pMain;           /* The database being vacuumed */
@@ -162,6 +163,8 @@ SQLITE_NOINLINE int sqlite3RunVacuum(
  const char *zDbMain;    /* Schema name of database to vacuum */
  const char *zOut;       /* Name of output file */

+  assert( bReset==0 || pOut==0 );
+  if( (db->flags & SQLITE_ResetDatabase)!=0 && pOut==0 ) bReset = 1;
  if( !db->autoCommit ){
    sqlite3SetString(pzErrMsg, db, "cannot VACUUM from within a transaction");
    return SQLITE_ERROR; /* IMP: R-12218-18073 */
@@ -269,54 +272,59 @@ SQLITE_NOINLINE int sqlite3RunVacuum(
                                           sqlite3BtreeGetAutoVacuum(pMain));
 #endif

-  /* Query the schema of the main database. Create a mirror schema
-  ** in the temporary database.
-  */
-  db->init.iDb = nDb; /* force new CREATE statements into vacuum_db */
-  rc = execSqlF(db, pzErrMsg,
-      "SELECT sql FROM \"%w\".sqlite_schema"
-      " WHERE type='table'AND name<>'sqlite_sequence'"
-      " AND coalesce(rootpage,1)>0",
-      zDbMain
-  );
-  if( rc!=SQLITE_OK ) goto end_of_vacuum;
-  rc = execSqlF(db, pzErrMsg,
-      "SELECT sql FROM \"%w\".sqlite_schema"
-      " WHERE type='index'",
-      zDbMain
-  );
-  if( rc!=SQLITE_OK ) goto end_of_vacuum;
-  db->init.iDb = 0;
-
-  /* Loop through the tables in the main database. For each, do
-  ** an "INSERT INTO vacuum_db.xxx SELECT * FROM main.xxx;" to copy
-  ** the contents to the temporary database.
-  */
-  rc = execSqlF(db, pzErrMsg,
-      "SELECT'INSERT INTO vacuum_db.'||quote(name)"
-      "||' SELECT*FROM\"%w\".'||quote(name)"
-      "FROM vacuum_db.sqlite_schema "
-      "WHERE type='table'AND coalesce(rootpage,1)>0",
-      zDbMain
-  );
-  assert( (db->mDbFlags & DBFLAG_Vacuum)!=0 );
-  db->mDbFlags &= ~DBFLAG_Vacuum;
-  if( rc!=SQLITE_OK ) goto end_of_vacuum;
-
-  /* Copy the triggers, views, and virtual tables from the main database
-  ** over to the temporary database.  None of these objects has any
-  ** associated storage, so all we have to do is copy their entries
-  ** from the schema table.
-  */
-  rc = execSqlF(db, pzErrMsg,
-      "INSERT INTO vacuum_db.sqlite_schema"
-      " SELECT*FROM \"%w\".sqlite_schema"
-      " WHERE type IN('view','trigger')"
-      " OR(type='table'AND rootpage=0)",
-      zDbMain
-  );
+  if( !bReset ){
+    /* Query the schema of the main database. Create a mirror schema
+    ** in the temporary database.
+    */
+    db->init.iDb = nDb; /* force new CREATE statements into vacuum_db */
+    rc = execSqlF(db, pzErrMsg,
+        "SELECT sql FROM \"%w\".sqlite_schema"
+        " WHERE type='table'AND name<>'sqlite_sequence'"
+        " AND coalesce(rootpage,1)>0",
+        zDbMain
+    );
+    if( rc!=SQLITE_OK ) goto end_of_vacuum;
+    rc = execSqlF(db, pzErrMsg,
+        "SELECT sql FROM \"%w\".sqlite_schema"
+        " WHERE type='index'",
+        zDbMain
+    );
+    if( rc!=SQLITE_OK ) goto end_of_vacuum;
+    db->init.iDb = 0;
+  
+    /* Loop through the tables in the main database. For each, do
+    ** an "INSERT INTO vacuum_db.xxx SELECT * FROM main.xxx;" to copy
+    ** the contents to the temporary database.
+    */
+    rc = execSqlF(db, pzErrMsg,
+        "SELECT'INSERT INTO vacuum_db.'||quote(name)"
+        "||' SELECT*FROM\"%w\".'||quote(name)"
+        "FROM vacuum_db.sqlite_schema "
+        "WHERE type='table'AND coalesce(rootpage,1)>0",
+        zDbMain
+    );
+    assert( (db->mDbFlags & DBFLAG_Vacuum)!=0 );
+    db->mDbFlags &= ~DBFLAG_Vacuum;
+    if( rc!=SQLITE_OK ) goto end_of_vacuum;
+  
+    /* Copy the triggers, views, and virtual tables from the main database
+    ** over to the temporary database.  None of these objects has any
+    ** associated storage, so all we have to do is copy their entries
+    ** from the schema table.
+    */
+    rc = execSqlF(db, pzErrMsg,
+        "INSERT INTO vacuum_db.sqlite_schema"
+        " SELECT*FROM \"%w\".sqlite_schema"
+        " WHERE type IN('view','trigger')"
+        " OR(type='table'AND rootpage=0)",
+        zDbMain
+    );
+  }else{
+    rc = sqlite3BtreeBeginTrans(pTemp, 2, 0);
+  }
  if( rc ) goto end_of_vacuum;

+
  /* At this point, there is a write transaction open on both the 
  ** vacuum database and the main database. Assuming no error occurs,
  ** both transactions are closed by this block - the main database
@@ -2588,66 +2588,19 @@ case OP_IsNull: {            /* same as TK_ISNULL, jump, in1 */
  break;
 }

-/* Opcode: IsType P1 P2 P3 P4 P5
-** Synopsis: if typeof(P1.P3) in P5 goto P2
-**
-** Jump to P2 if the type of a column in a btree is one of the types specified
-** by the P5 bitmask.
-**
-** P1 is normally a cursor on a btree for which the row decode cache is
-** valid through at least column P3.  In other words, there should have been
-** a prior OP_Column for column P3 or greater.  If the cursor is not valid,
-** then this opcode might give spurious results.
-** The the btree row has fewer than P3 columns, then use P4 as the
-** datatype.
-**
-** If P1 is -1, then P3 is a register number and the datatype is taken
-** from the value in that register.
-**
-** P5 is a bitmask of data types.  SQLITE_INTEGER is the least significant
-** (0x01) bit. SQLITE_FLOAT is the 0x02 bit. SQLITE_TEXT is 0x04.
-** SQLITE_BLOB is 0x08.  SQLITE_NULL is 0x10.
-**
-** Take the jump to address P2 if and only if the datatype of the
-** value determined by P1 and P3 corresponds to one of the bits in the
-** P5 bitmask.
+/* Opcode: IsNullOrType P1 P2 P3 * *
+** Synopsis: if typeof(r[P1]) IN (P3,5) goto P2
 **
+** Jump to P2 if the value in register P1 is NULL or has a datatype P3.
+** P3 is an integer which should be one of SQLITE_INTEGER, SQLITE_FLOAT,
+** SQLITE_BLOB, SQLITE_NULL, or SQLITE_TEXT.
 */
-case OP_IsType: {        /* jump */
-  VdbeCursor *pC;
-  u16 typeMask;
-  u32 serialType;
-
-  assert( pOp->p1>=(-1) && pOp->p1<p->nCursor );
-  assert( pOp->p1>=0 || (pOp->p3>=0 && pOp->p3<=(p->nMem+1 - p->nCursor)) );
-  if( pOp->p1>=0 ){
-    pC = p->apCsr[pOp->p1];
-    assert( pC!=0 );
-    assert( pOp->p3>=0 );
-    if( pOp->p3<pC->nHdrParsed ){
-      serialType = pC->aType[pOp->p3];
-      if( serialType==0 ){
-        typeMask = 0x10;   /* SQLITE_NULL */
-      }else if( serialType==7 ){
-        typeMask = 0x02;   /* SQLITE_FLOAT */
-      }else if( serialType<12 ){
-        typeMask = 0x01;   /* SQLITE_INTEGER */
-      }else if( serialType&1 ){
-        typeMask = 0x04;   /* SQLITE_TEXT */
-      }else{
-        typeMask = 0x08;   /* SQLITE_BLOB */
-      }
-    }else{
-      typeMask = 1 << (pOp->p4.i - 1);
-    }
-  }else{
-    assert( memIsValid(&aMem[pOp->p3]) );
-    typeMask = 1 << (sqlite3_value_type((sqlite3_value*)&aMem[pOp->p3])-1);
-  }
-  VdbeBranchTaken( (typeMask & pOp->p5)!=0, 2);
-  if( typeMask & pOp->p5 ){
-    goto jump_to_p2;
-  }
+case OP_IsNullOrType: {      /* jump, in1 */
+  int doTheJump;
+  pIn1 = &aMem[pOp->p1];
+  doTheJump = (pIn1->flags & MEM_Null)!=0 || sqlite3_value_type(pIn1)==pOp->p3;
+  VdbeBranchTaken( doTheJump, 2);
+  if( doTheJump ) goto jump_to_p2;
  break;
 }

@@ -4699,13 +4652,7 @@ case OP_SeekGT: {       /* jump, in3, group */

    r.aMem = &aMem[pOp->p3];
 #ifdef SQLITE_DEBUG
-    {
-      int i;
-      for(i=0; i<r.nField; i++){
-        assert( memIsValid(&r.aMem[i]) );
-        if( i>0 ) REGISTER_TRACE(pOp->p3+i, &r.aMem[i]);
-      }
-    }
+    { int i; for(i=0; i<r.nField; i++) assert( memIsValid(&r.aMem[i]) ); }
 #endif
    r.eqSeen = 0;
    rc = sqlite3BtreeIndexMoveto(pC->uc.pCursor, &r, &res);
@@ -4768,7 +4715,7 @@ seek_not_found:
 }


-/* Opcode: SeekScan  P1 P2 * * P5
+/* Opcode: SeekScan  P1 P2 * * *
 ** Synopsis: Scan-ahead up to P1 rows
 **
 ** This opcode is a prefix opcode to OP_SeekGE.  In other words, this
@@ -4778,8 +4725,8 @@ seek_not_found:
 ** This opcode uses the P1 through P4 operands of the subsequent
 ** OP_SeekGE.  In the text that follows, the operands of the subsequent
 ** OP_SeekGE opcode are denoted as SeekOP.P1 through SeekOP.P4.   Only
-** the P1, P2 and P5 operands of this opcode are also used, and  are called
-** This.P1, This.P2 and This.P5.
+** the P1 and P2 operands of this opcode are also used, and  are called
+** This.P1 and This.P2.
 **
 ** This opcode helps to optimize IN operators on a multi-column index
 ** where the IN operator is on the later terms of the index by avoiding
@@ -4789,51 +4736,29 @@ seek_not_found:
 **
 ** The SeekGE.P3 and SeekGE.P4 operands identify an unpacked key which
 ** is the desired entry that we want the cursor SeekGE.P1 to be pointing
-** to.  Call this SeekGE.P3/P4 row the "target".
+** to.  Call this SeekGE.P4/P5 row the "target".
 **
 ** If the SeekGE.P1 cursor is not currently pointing to a valid row,
 ** then this opcode is a no-op and control passes through into the OP_SeekGE.
 **
 ** If the SeekGE.P1 cursor is pointing to a valid row, then that row
 ** might be the target row, or it might be near and slightly before the
-** target row, or it might be after the target row.  If the cursor is
-** currently before the target row, then this opcode attempts to position
-** the cursor on or after the target row by invoking sqlite3BtreeStep()
-** on the cursor between 1 and This.P1 times.
+** target row.  This opcode attempts to position the cursor on the target
+** row by, perhaps by invoking sqlite3BtreeStep() on the cursor
+** between 0 and This.P1 times.
 **
-** The This.P5 parameter is a flag that indicates what to do if the
-** cursor ends up pointing at a valid row that is past the target
-** row.  If This.P5 is false (0) then a jump is made to SeekGE.P2.  If
-** This.P5 is true (non-zero) then a jump is made to This.P2.  The P5==0
-** case occurs when there are no inequality constraints to the right of
-** the IN constraing.  The jump to SeekGE.P2 ends the loop.  The P5!=0 case
-** occurs when there are inequality constraints to the right of the IN
-** operator.  In that case, the This.P2 will point either directly to or
-** to setup code prior to the OP_IdxGT or OP_IdxGE opcode that checks for
-** loop terminate.
+** There are three possible outcomes from this opcode:<ol>
 **
-** Possible outcomes from this opcode:<ol>
+** <li> If after This.P1 steps, the cursor is still pointing to a place that
+**      is earlier in the btree than the target row, then fall through
+**      into the subsquence OP_SeekGE opcode.
 **
-** <li> If the cursor is initally not pointed to any valid row, then
-**      fall through into the subsequent OP_SeekGE opcode.
+** <li> If the cursor is successfully moved to the target row by 0 or more
+**      sqlite3BtreeNext() calls, then jump to This.P2, which will land just
+**      past the OP_IdxGT or OP_IdxGE opcode that follows the OP_SeekGE.
 **
-** <li> If the cursor is left pointing to a row that is before the target
-**      row, even after making as many as This.P1 calls to
-**      sqlite3BtreeNext(), then also fall through into OP_SeekGE.
-**
-** <li> If the cursor is left pointing at the target row, either because it
-**      was at the target row to begin with or because one or more
-**      sqlite3BtreeNext() calls moved the cursor to the target row,
-**      then jump to This.P2..,
-**
-** <li> If the cursor started out before the target row and a call to
-**      to sqlite3BtreeNext() moved the cursor off the end of the index
-**      (indicating that the target row definitely does not exist in the
-**      btree) then jump to SeekGE.P2, ending the loop.
-**
-** <li> If the cursor ends up on a valid row that is past the target row 
-**      (indicating that the target row does not exist in the btree) then
-**      jump to SeekOP.P2 if This.P5==0 or to This.P2 if This.P5>0.
+** <li> If the cursor ends up past the target row (indicating that the target
+**      row does not exist in the btree) then jump to SeekOP.P2. 
 ** </ol>
 */
 case OP_SeekScan: {
@@ -4844,25 +4769,14 @@ case OP_SeekScan: {

  assert( pOp[1].opcode==OP_SeekGE );

-  /* If pOp->p5 is clear, then pOp->p2 points to the first instruction past the
-  ** OP_IdxGT that follows the OP_SeekGE. Otherwise, it points to the first
-  ** opcode past the OP_SeekGE itself.  */
+  /* pOp->p2 points to the first instruction past the OP_IdxGT that
+  ** follows the OP_SeekGE.  */
  assert( pOp->p2>=(int)(pOp-aOp)+2 );
-#ifdef SQLITE_DEBUG
-  if( pOp->p5==0 ){
-    /* There are no inequality constraints following the IN constraint. */
-    assert( pOp[1].p1==aOp[pOp->p2-1].p1 );
-    assert( pOp[1].p2==aOp[pOp->p2-1].p2 );
-    assert( pOp[1].p3==aOp[pOp->p2-1].p3 );
-    assert( aOp[pOp->p2-1].opcode==OP_IdxGT 
-         || aOp[pOp->p2-1].opcode==OP_IdxGE );
-    testcase( aOp[pOp->p2-1].opcode==OP_IdxGE );
-  }else{
-    /* There are inequality constraints.  */
-    assert( pOp->p2==(int)(pOp-aOp)+2 );
-    assert( aOp[pOp->p2-1].opcode==OP_SeekGE );
-  }
-#endif
+  assert( aOp[pOp->p2-1].opcode==OP_IdxGT || aOp[pOp->p2-1].opcode==OP_IdxGE );
+  testcase( aOp[pOp->p2-1].opcode==OP_IdxGE );
+  assert( pOp[1].p1==aOp[pOp->p2-1].p1 );
+  assert( pOp[1].p2==aOp[pOp->p2-1].p2 );
+  assert( pOp[1].p3==aOp[pOp->p2-1].p3 );

  assert( pOp->p1>0 );
  pC = p->apCsr[pOp[1].p1];
@@ -4896,9 +4810,8 @@ case OP_SeekScan: {
  while(1){
    rc = sqlite3VdbeIdxKeyCompare(db, pC, &r, &res);
    if( rc ) goto abort_due_to_error;
-    if( res>0 && pOp->p5==0 ){
+    if( res>0 ){
      seekscan_search_fail:
-      /* Jump to SeekGE.P2, ending the loop */
 #ifdef SQLITE_DEBUG
      if( db->flags&SQLITE_VdbeTrace ){
        printf("... %d steps and then skip\n", pOp->p1 - nStep);
@@ -4908,8 +4821,7 @@ case OP_SeekScan: {
      pOp++;
      goto jump_to_p2;
    }
-    if( res>=0 ){
-      /* Jump to This.P2, bypassing the OP_SeekGE opcode */
+    if( res==0 ){
 #ifdef SQLITE_DEBUG
      if( db->flags&SQLITE_VdbeTrace ){
        printf("... %d steps and then success\n", pOp->p1 - nStep);
@@ -7724,7 +7636,7 @@ case OP_JournalMode: {    /* out2 */
 #endif /* SQLITE_OMIT_PRAGMA */

 #if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
-/* Opcode: Vacuum P1 P2 * * *
+/* Opcode: Vacuum P1 P2 P3 * *
 **
 ** Vacuum the entire database P1.  P1 is 0 for "main", and 2 or more
 ** for an attached database.  The "temp" database may not be vacuumed.
@@ -7732,11 +7644,15 @@ case OP_JournalMode: {    /* out2 */
 ** If P2 is not zero, then it is a register holding a string which is
 ** the file into which the result of vacuum should be written.  When
 ** P2 is zero, the vacuum overwrites the original database.
+**
+** If P3 is not zero, then delete all database content as part of the
+** vacuum.  It is not allowed for both P2 and P3 to be non-zero at the
+** same time.
 */
 case OP_Vacuum: {
  assert( p->readOnly==0 );
  rc = sqlite3RunVacuum(&p->zErrMsg, db, pOp->p1,
-                        pOp->p2 ? &aMem[pOp->p2] : 0);
+                        pOp->p2 ? &aMem[pOp->p2] : 0, pOp->p3);
  if( rc ) goto abort_due_to_error;
  break;
 }
@@ -832,7 +832,6 @@ int sqlite3VdbeMemCast(Mem *pMem, u8 aff, u8 encoding){
      sqlite3ValueApplyAffinity(pMem, SQLITE_AFF_TEXT, encoding);
      assert( pMem->flags & MEM_Str || pMem->db->mallocFailed );
      pMem->flags &= ~(MEM_Int|MEM_Real|MEM_IntReal|MEM_Blob|MEM_Zero);
-      if( encoding!=SQLITE_UTF8 ) pMem->n &= ~1;
      return sqlite3VdbeChangeEncoding(pMem, encoding);
    }
  }
@@ -1422,8 +1422,6 @@ static SQLITE_NOINLINE void filterPullDown(
      testcase( pTerm->wtFlags & TERM_VIRTUAL );
      regRowid = sqlite3GetTempReg(pParse);
      regRowid = codeEqualityTerm(pParse, pTerm, pLevel, 0, 0, regRowid);
-      sqlite3VdbeAddOp2(pParse->pVdbe, OP_MustBeInt, regRowid, addrNxt);
-      VdbeCoverage(pParse->pVdbe);
      sqlite3VdbeAddOp4Int(pParse->pVdbe, OP_Filter, pLevel->regFilter,
                           addrNxt, regRowid, 1);
      VdbeCoverage(pParse->pVdbe);
@@ -1685,8 +1683,6 @@ Bitmask sqlite3WhereCodeOneLoopStart(
    if( iRowidReg!=iReleaseReg ) sqlite3ReleaseTempReg(pParse, iReleaseReg);
    addrNxt = pLevel->addrNxt;
    if( pLevel->regFilter ){
-      sqlite3VdbeAddOp2(v, OP_MustBeInt, iRowidReg, addrNxt);
-      VdbeCoverage(v);
      sqlite3VdbeAddOp4Int(v, OP_Filter, pLevel->regFilter, addrNxt,
                           iRowidReg, 1);
      VdbeCoverage(v);
@@ -2038,11 +2034,6 @@ Bitmask sqlite3WhereCodeOneLoopStart(
        ** guess. */
        addrSeekScan = sqlite3VdbeAddOp1(v, OP_SeekScan, 
                                         (pIdx->aiRowLogEst[0]+9)/10);
-        if( pRangeStart ){
-          sqlite3VdbeChangeP5(v, 1);
-          sqlite3VdbeChangeP2(v, addrSeekScan, sqlite3VdbeCurrentAddr(v)+1);
-          addrSeekScan = 0;
-        }
        VdbeCoverage(v);
      }
      sqlite3VdbeAddOp4Int(v, op, iIdxCur, addrNxt, regBase, nConstraint);
@@ -1,70 +0,0 @@
-# 2022 October 06
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-#
-# Tests for queries that use bloom filters
-
-set testdir [file dirname $argv0]
-source $testdir/tester.tcl
-source $testdir/lock_common.tcl
-source $testdir/malloc_common.tcl
-
-set testprefix bloom1
-
-# Tests 1.*  verify that the bloom filter code correctly handles the
-# case where the RHS of an (<ipk-column> = ?) expression must be coerced
-# to an integer before the comparison made.
-#
-do_execsql_test 1.0 {
-  CREATE TABLE t1(a, b);
-  CREATE TABLE t2(c INTEGER PRIMARY KEY, d);
-}
-
-do_execsql_test 1.1 {
-  INSERT INTO t1 VALUES('hello', 'world');
-  INSERT INTO t2 VALUES(14, 'fourteen');
-}
-
-do_execsql_test 1.2 {
-  ANALYZE sqlite_schema;
-  INSERT INTO sqlite_stat1 VALUES('t2','idx1','6 6');
-  ANALYZE sqlite_schema;
-}
-
-do_execsql_test 1.3 {
-  SELECT 'affinity!' FROM t1 CROSS JOIN t2 WHERE t2.c = '14';
-} {affinity!}
-
-
-reset_db
-do_execsql_test 1.4 {
-  CREATE TABLE t1(a, b TEXT);
-  CREATE TABLE t2(c INTEGER PRIMARY KEY, d);
-  CREATE TABLE t3(e INTEGER PRIMARY KEY, f);
-
-  ANALYZE sqlite_schema;
-  INSERT INTO sqlite_stat1 VALUES('t1','idx1','600 6');
-  INSERT INTO sqlite_stat1 VALUES('t2','idx1','6 6');
-  INSERT INTO sqlite_stat1 VALUES('t3','idx2','6 6');
-  ANALYZE sqlite_schema;
-
-  INSERT INTO t1 VALUES(1, '123');
-  INSERT INTO t2 VALUES(123, 'one');
-  INSERT INTO t3 VALUES(123, 'two');
-}
-
-do_execsql_test 1.5 {
-  SELECT 'result' FROM t1, t2, t3 
-  WHERE t2.c=t1.b AND t2.d!='silly'
-    AND t3.e=t1.b AND t3.f!='silly'
-} {result}
-
-finish_test
-
@@ -174,7 +174,7 @@ do_test memsubsys1-4.4 {
 } 0
 do_test memsubsys1-4.5 {
  set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-  expr {$maxreq<9000}
+  expr {$maxreq<7000}
 } 1

 db close
@@ -1,63 +0,0 @@
-# 2022 October 7
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-# This file implements regression tests for SQLite library.
-#
-
-set testdir [file dirname $argv0]
-source $testdir/tester.tcl
-set testprefix seekscan1
-
-do_execsql_test 1.0 {
-  CREATE TABLE t1(a TEXT, b INT, c INT NOT NULL, PRIMARY KEY(a,b,c));
-  WITH RECURSIVE c(x) AS (VALUES(0) UNION ALL SELECT x+1 FROM c WHERE x<1997)
-    INSERT INTO t1(a,b,c) SELECT printf('xyz%d',x/10),x/6,x FROM c;
-  INSERT INTO t1 VALUES('abc',234,6);
-  INSERT INTO t1 VALUES('abc',345,7);
-  ANALYZE;
-}
-
-do_execsql_test 1.1 {
-  SELECT a,b,c FROM t1 
-  WHERE b IN (234, 345) AND c BETWEEN 6 AND 6.5 AND a='abc' 
-  ORDER BY a, b;
-} {
-  abc 234 6
-}
-
-do_execsql_test 1.2 {
-  SELECT a,b,c FROM t1 
-  WHERE b IN (234, 345) AND c BETWEEN 6 AND 7 AND a='abc' 
-  ORDER BY a, b;
-} {
-  abc 234 6
-  abc 345 7
-}
-
-do_execsql_test 1.3 {
-  SELECT a,b,c FROM t1 
-  WHERE b IN (234, 345) AND c >=6 AND a='abc' 
-  ORDER BY a, b;
-} {
-  abc 234 6
-  abc 345 7
-}
-
-do_execsql_test 1.4 {
-  SELECT a,b,c FROM t1 
-  WHERE b IN (234, 345) AND c<=7 AND a='abc' 
-  ORDER BY a, b;
-} {
-  abc 234 6
-  abc 345 7
-}
-
-
-finish_test
@@ -7,8 +7,7 @@ static const char zHelp[] =
  "Usage: %s [--options] DATABASE\n"
  "Options:\n"
  "  --autovacuum        Enable AUTOVACUUM mode\n"
-  "  --big-transactions  Add BEGIN/END around all large tests\n"
-  "  --cachesize N       Set PRAGMA cache_size=N. Note: N is pages, not bytes\n"
+  "  --cachesize N       Set the cache size to N\n"
  "  --checkpoint        Run PRAGMA wal_checkpoint after each test case\n"
  "  --exclusive         Enable locking_mode=EXCLUSIVE\n"
  "  --explain           Like --sqlonly but with added EXPLAIN keywords\n"
@@ -21,7 +20,6 @@ static const char zHelp[] =
  "  --mmap SZ           MMAP the first SZ bytes of the database file\n"
  "  --multithread       Set multithreaded mode\n"
  "  --nomemstat         Disable memory statistics\n"
-  "  --nomutex           Open db with SQLITE_OPEN_NOMUTEX\n"
  "  --nosync            Set PRAGMA synchronous=OFF\n"
  "  --notnull           Add NOT NULL constraints to table columns\n"
  "  --output FILE       Store SQL output in FILE\n"
@@ -45,8 +43,7 @@ static const char zHelp[] =
  "  --threads N         Use up to N threads for sorting\n"
  "  --utf16be           Set text encoding to UTF-16BE\n"
  "  --utf16le           Set text encoding to UTF-16LE\n"
-  "  --verify            Run additional verification steps\n"
-  "  --vfs NAME          Use the given (preinstalled) VFS\n"
+  "  --verify            Run additional verification steps.\n"
  "  --without-rowid     Use WITHOUT ROWID where appropriate\n"
 ;

@@ -100,7 +97,6 @@ static struct Global {
  int nRepeat;               /* Repeat selects this many times */
  int doCheckpoint;          /* Run PRAGMA wal_checkpoint after each trans */
  int nReserve;              /* Reserve bytes */
-  int doBigTransactions;     /* Enable transactions on tests 410 and 510 */
  const char *zWR;           /* Might be WITHOUT ROWID */
  const char *zNN;           /* Might be NOT NULL */
  const char *zPK;           /* Might be UNIQUE or PRIMARY KEY */
@@ -376,12 +372,10 @@ int speedtest1_numbername(unsigned int n, char *zOut, int nOut){
 #define NAMEWIDTH 60
 static const char zDots[] =
  ".......................................................................";
-static int iTestNumber = 0;  /* Current test # for begin/end_test(). */
 void speedtest1_begin_test(int iTestNum, const char *zTestName, ...){
  int n = (int)strlen(zTestName);
  char *zName;
  va_list ap;
-  iTestNumber = iTestNum;
  va_start(ap, zTestName);
  zName = sqlite3_vmprintf(zTestName, ap);
  va_end(ap);
@@ -390,11 +384,6 @@ void speedtest1_begin_test(int iTestNum, const char *zTestName, ...){
    zName[NAMEWIDTH] = 0;
    n = NAMEWIDTH;
  }
-  if( g.pScript ){
-    fprintf(g.pScript,"-- begin test %d %.*s\n", iTestNumber, n, zName)
-      /* maintenance reminder: ^^^ code in ext/wasm expects %d to be
-      ** field #4 (as in: cut -d' ' -f4). */;
-  }
  if( g.bSqlOnly ){
    printf("/* %4d - %s%.*s */\n", iTestNum, zName, NAMEWIDTH-n, zDots);
  }else{
@@ -415,10 +404,6 @@ void speedtest1_exec(const char*,...);
 void speedtest1_end_test(void){
  sqlite3_int64 iElapseTime = speedtest1_timestamp() - g.iStart;
  if( g.doCheckpoint ) speedtest1_exec("PRAGMA wal_checkpoint;");
-  assert( iTestNumber > 0 );
-  if( g.pScript ){
-    fprintf(g.pScript,"-- end test %d\n", iTestNumber);
-  }
  if( !g.bSqlOnly ){
    g.iTotal += iElapseTime;
    printf("%4d.%03ds\n", (int)(iElapseTime/1000), (int)(iElapseTime%1000));
@@ -427,7 +412,6 @@ void speedtest1_end_test(void){
    sqlite3_finalize(g.pStmt);
    g.pStmt = 0;
  }
-  iTestNumber = 0;
 }

 /* Report end of testing */
@@ -1121,24 +1105,12 @@ void testset_main(void){
  speedtest1_exec("COMMIT");
  speedtest1_end_test();
  speedtest1_begin_test(410, "%d SELECTS on an IPK", n);
-  if( g.doBigTransactions ){
-    /* Historical note: tests 410 and 510 have historically not used
-    ** explicit transactions. The --big-transactions flag was added
-    ** 2022-09-08 to support the WASM/OPFS build, as the run-times
-    ** approach 1 minute for each of these tests if they're not in an
-    ** explicit transaction. The run-time effect of --big-transaciions
-    ** on native builds is negligible. */
-    speedtest1_exec("BEGIN");
-  }
  speedtest1_prepare("SELECT b FROM t5 WHERE a=?1; --  %d times",n);
  for(i=1; i<=n; i++){
    x1 = swizzle(i,maxb);
    sqlite3_bind_int(g.pStmt, 1, (sqlite3_int64)x1);
    speedtest1_run();
  }
-  if( g.doBigTransactions ){
-    speedtest1_exec("COMMIT");
-  }
  speedtest1_end_test();

  sz = n = g.szTest*700;
@@ -1160,10 +1132,6 @@ void testset_main(void){
  speedtest1_exec("COMMIT");
  speedtest1_end_test();
  speedtest1_begin_test(510, "%d SELECTS on a TEXT PK", n);
-  if( g.doBigTransactions ){
-    /* See notes for test 410. */
-    speedtest1_exec("BEGIN");
-  }
  speedtest1_prepare("SELECT b FROM t6 WHERE a=?1; --  %d times",n);
  for(i=1; i<=n; i++){
    x1 = swizzle(i,maxb);
@@ -1171,9 +1139,6 @@ void testset_main(void){
    sqlite3_bind_text(g.pStmt, 1, zNum, -1, SQLITE_STATIC);
    speedtest1_run();
  }
-  if( g.doBigTransactions ){
-    speedtest1_exec("COMMIT");
-  }
  speedtest1_end_test();
  speedtest1_begin_test(520, "%d SELECT DISTINCT", n);
  speedtest1_exec("SELECT DISTINCT b FROM t5;");
@@ -2197,6 +2162,7 @@ static int xCompileOptions(void *pCtx, int nVal, char **azVal, char **azCol){
  printf("-- Compile option: %s\n", azVal[0]);
  return SQLITE_OK;
 }
+
 int main(int argc, char **argv){
  int doAutovac = 0;            /* True for --autovacuum */
  int cacheSize = 0;            /* Desired cache size.  0 means default */
@@ -2214,10 +2180,7 @@ int main(int argc, char **argv){
  int nThread = 0;              /* --threads value */
  int mmapSize = 0;             /* How big of a memory map to use */
  int memDb = 0;                /* --memdb.  Use an in-memory database */
-  int openFlags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE
-    ;                           /* SQLITE_OPEN_xxx flags. */
  char *zTSet = "main";         /* Which --testset torun */
-  const char * zVfs = 0;        /* --vfs NAME */
  int doTrace = 0;              /* True for --trace */
  const char *zEncoding = 0;    /* --utf16be or --utf16le */
  const char *zDbName = 0;      /* Name of the test database */
@@ -2229,19 +2192,10 @@ int main(int argc, char **argv){
  int i;                        /* Loop counter */
  int rc;                       /* API return code */

-#ifdef SQLITE_SPEEDTEST1_WASM
-  /* Resetting all state is important for the WASM build, which may
-  ** call main() multiple times. */
-  memset(&g, 0, sizeof(g));
-  iTestNumber = 0;
-#endif
 #ifdef SQLITE_CKSUMVFS_STATIC
  sqlite3_register_cksumvfs(0);
 #endif
-  /*
-  ** Confirms that argc has at least N arguments following argv[i]. */
-#define ARGC_VALUE_CHECK(N)                                       \
-  if( i>=argc-(N) ) fatal_error("missing argument on %s\n", argv[i])
+
  /* Display the version of SQLite being tested */
  printf("-- Speedtest1 for SQLite %s %.48s\n",
         sqlite3_libversion(), sqlite3_sourceid());
@@ -2258,11 +2212,10 @@ int main(int argc, char **argv){
      do{ z++; }while( z[0]=='-' );
      if( strcmp(z,"autovacuum")==0 ){
        doAutovac = 1;
-      }else if( strcmp(z,"big-transactions")==0 ){
-        g.doBigTransactions = 1;
      }else if( strcmp(z,"cachesize")==0 ){
-        ARGC_VALUE_CHECK(1);
-        cacheSize = integerValue(argv[++i]);
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        i++;
+        cacheSize = integerValue(argv[i]);
      }else if( strcmp(z,"exclusive")==0 ){
        doExclusive = 1;
      }else if( strcmp(z,"checkpoint")==0 ){
@@ -2271,20 +2224,20 @@ int main(int argc, char **argv){
        g.bSqlOnly = 1;
        g.bExplain = 1;
      }else if( strcmp(z,"heap")==0 ){
-        ARGC_VALUE_CHECK(2);
+        if( i>=argc-2 ) fatal_error("missing arguments on %s\n", argv[i]);
        nHeap = integerValue(argv[i+1]);
        mnHeap = integerValue(argv[i+2]);
        i += 2;
      }else if( strcmp(z,"incrvacuum")==0 ){
        doIncrvac = 1;
      }else if( strcmp(z,"journal")==0 ){
-        ARGC_VALUE_CHECK(1);
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
        zJMode = argv[++i];
      }else if( strcmp(z,"key")==0 ){
-        ARGC_VALUE_CHECK(1);
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
        zKey = argv[++i];
      }else if( strcmp(z,"lookaside")==0 ){
-        ARGC_VALUE_CHECK(2);
+        if( i>=argc-2 ) fatal_error("missing arguments on %s\n", argv[i]);
        nLook = integerValue(argv[i+1]);
        szLook = integerValue(argv[i+2]);
        i += 2;
@@ -2298,11 +2251,9 @@ int main(int argc, char **argv){
 #endif
 #if SQLITE_VERSION_NUMBER>=3007017
      }else if( strcmp(z, "mmap")==0 ){
-        ARGC_VALUE_CHECK(1);
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
        mmapSize = integerValue(argv[++i]);
 #endif
-      }else if( strcmp(z,"nomutex")==0 ){
-        openFlags |= SQLITE_OPEN_NOMUTEX;
      }else if( strcmp(z,"nosync")==0 ){
        noSync = 1;
      }else if( strcmp(z,"notnull")==0 ){
@@ -2312,7 +2263,7 @@ int main(int argc, char **argv){
        fatal_error("The --output option is not supported with"
                    " -DSPEEDTEST_OMIT_HASH\n");
 #else
-        ARGC_VALUE_CHECK(1);
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
        i++;
        if( strcmp(argv[i],"-")==0 ){
          g.hashFile = stdout;
@@ -2324,10 +2275,10 @@ int main(int argc, char **argv){
        }
 #endif
      }else if( strcmp(z,"pagesize")==0 ){
-        ARGC_VALUE_CHECK(1);
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
        pageSize = integerValue(argv[++i]);
      }else if( strcmp(z,"pcache")==0 ){
-        ARGC_VALUE_CHECK(2);
+        if( i>=argc-2 ) fatal_error("missing arguments on %s\n", argv[i]);
        nPCache = integerValue(argv[i+1]);
        szPCache = integerValue(argv[i+2]);
        doPCache = 1;
@@ -2335,8 +2286,9 @@ int main(int argc, char **argv){
      }else if( strcmp(z,"primarykey")==0 ){
        g.zPK = "PRIMARY KEY";
      }else if( strcmp(z,"repeat")==0 ){
-        ARGC_VALUE_CHECK(1);
-        g.nRepeat = integerValue(argv[++i]);
+        if( i>=argc-1 ) fatal_error("missing arguments on %s\n", argv[i]);
+        g.nRepeat = integerValue(argv[i+1]);
+        i += 1;
      }else if( strcmp(z,"reprepare")==0 ){
        g.bReprepare = 1;
 #if SQLITE_VERSION_NUMBER>=3006000
@@ -2346,7 +2298,7 @@ int main(int argc, char **argv){
        sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
 #endif
      }else if( strcmp(z,"script")==0 ){
-        ARGC_VALUE_CHECK(1);
+        if( i>=argc-1 ) fatal_error("missing arguments on %s\n", argv[i]);
        if( g.pScript ) fclose(g.pScript);
        g.pScript = fopen(argv[++i], "wb");
        if( g.pScript==0 ){
@@ -2357,24 +2309,24 @@ int main(int argc, char **argv){
      }else if( strcmp(z,"shrink-memory")==0 ){
        g.bMemShrink = 1;
      }else if( strcmp(z,"size")==0 ){
-        ARGC_VALUE_CHECK(1);
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
        g.szTest = integerValue(argv[++i]);
      }else if( strcmp(z,"stats")==0 ){
        showStats = 1;
      }else if( strcmp(z,"temp")==0 ){
-        ARGC_VALUE_CHECK(1);
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
        i++;
        if( argv[i][0]<'0' || argv[i][0]>'9' || argv[i][1]!=0 ){
          fatal_error("argument to --temp should be integer between 0 and 9");
        }
        g.eTemp = argv[i][0] - '0';
      }else if( strcmp(z,"testset")==0 ){
-        ARGC_VALUE_CHECK(1);
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
        zTSet = argv[++i];
      }else if( strcmp(z,"trace")==0 ){
        doTrace = 1;
      }else if( strcmp(z,"threads")==0 ){
-        ARGC_VALUE_CHECK(1);
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
        nThread = integerValue(argv[++i]);
      }else if( strcmp(z,"utf16le")==0 ){
        zEncoding = "utf16le";
@@ -2385,11 +2337,8 @@ int main(int argc, char **argv){
 #ifndef SPEEDTEST_OMIT_HASH
        HashInit();
 #endif
-      }else if( strcmp(z,"vfs")==0 ){
-        ARGC_VALUE_CHECK(1);
-        zVfs = argv[++i];
      }else if( strcmp(z,"reserve")==0 ){
-        ARGC_VALUE_CHECK(1);
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
        g.nReserve = atoi(argv[++i]);
      }else if( strcmp(z,"without-rowid")==0 ){
        if( strstr(g.zWR,"WITHOUT")!=0 ){
@@ -2422,7 +2371,6 @@ int main(int argc, char **argv){
                  argv[i], argv[0]);
    }
  }
-#undef ARGC_VALUE_CHECK
  if( zDbName!=0 ) unlink(zDbName);
 #if SQLITE_VERSION_NUMBER>=3006001
  if( nHeap>0 ){
@@ -2447,8 +2395,7 @@ int main(int argc, char **argv){
  sqlite3_initialize();

  /* Open the database and the input file */
-  if( sqlite3_open_v2(memDb ? ":memory:" : zDbName, &g.db,
-                      openFlags, zVfs) ){
+  if( sqlite3_open(memDb ? ":memory:" : zDbName, &g.db) ){
    fatal_error("Cannot open database file: %s\n", zDbName);
  }
 #if SQLITE_VERSION_NUMBER>=3006001
@@ -2633,13 +2580,3 @@ int main(int argc, char **argv){
  free( pHeap );
  return 0;
 }
-
-#ifdef SQLITE_SPEEDTEST1_WASM
-/*
-** A workaround for some inconsistent behaviour with how
-** main() does (or does not) get exported to WASM.
-*/
-int wasm_main(int argc, char **argv){
-  return main(argc, argv);
-}
-#endif
@@ -43,7 +43,7 @@ set ::headCode "
 ** autoconf-based build
 */
 #if defined(_HAVE_SQLITE_CONFIG_H) && !defined(SQLITECONFIG_H)
-#include \"sqlite_cfg.h\"
+#include \"config.h\"
 #define SQLITECONFIG_H 1
 #endif

@@ -398,6 +398,9 @@ set pragma_def {
  TYPE: FLAG
  ARG:  SQLITE_LegacyAlter
  IF:   !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+
+  NAME: reset_database
+  IF:   !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
 }

 # Open the output file