Fix an error in the previous commit causing timings to be logged for every "PRAGMA...

FossilOrigin-Name: 1e8220c1b4b5102eee08f4b1f783827156c682e5e7b00bc7283b08af15198681

diff --git a/manifest b/manifest
index 1a0ef9f9d63420a4a9888925bd08d3740528a16e..fb4e1eb5ba82de93171ad67b61fbb8c36a74f7a5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Different\sversion\sof\s"PRAGMA\sschema_version"\sinstrumentation.
-D 2022-12-22T14:29:55.943
+C Fix\san\serror\sin\sthe\sprevious\scommit\scausing\stimings\sto\sbe\slogged\sfor\severy\s"PRAGMA\sschema_version"\scommand,\snot\sjust\sthose\sthat\sare\sslower\sthan\s2\sseconds.
+D 2022-12-22T15:04:04.115
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -670,7 +670,7 @@ F src/util.c 0be191521ff6d2805995f4910f0b6231b42843678b2efdc1abecaf39929a673f
 F src/vacuum.c 5b7888f917936dda09f98b1fda164cff1dad44fb5e143436bdbb9dc3191ce2df
 F src/vdbe.c addae8131682cb442a636a423e3fede8aa17385e625319e79b9604ccfe3e51b1
 F src/vdbe.h 2b994184581ac41e9f7ec49ac0f1569da1766f24d7a1775df67328d749a22a1c
-F src/vdbeInt.h a86401bdb72a4c4e512d0bef4456b06a99eb91729bc572f5e0a6945abec34f40
+F src/vdbeInt.h 8e53106b328addd909ea3fc1302e3a7b291429b23b4b51e0118e5d9de50e5159
 F src/vdbeapi.c fc3183daf72808b4311b228989120fdbc2dc44972fb0d77d5c453460cc0e5b2c
 F src/vdbeaux.c 8fe6ea4ea89376846b07db993e631d654e03bec3f0ad388c0c4f802324debd5a
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
@@ -2035,8 +2035,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 44dd01e3152eba0b487f9ec5349ecc9e6474e94a10e3f4951b9d928ea39f53f0
-R d5056c419efcdf823361a2366dfea511
+P b9efbc538b5461e6eb429630b3c61a7a849a77cdc4cc0efd6fc80d3e27d5f389
+R debed6d401f8eec5114dc810654b5d1e
 U dan
-Z 74b2fd006816a04f2a350fdf86f0491b
+Z 4fde410c28425417d08e1340c227fb2c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 94aabf0a449209c5115a5a6e989c6854fa18f23e..400c5f13b16d43282f31b31d6396777b4d252f74 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b9efbc538b5461e6eb429630b3c61a7a849a77cdc4cc0efd6fc80d3e27d5f389
\ No newline at end of file
+1e8220c1b4b5102eee08f4b1f783827156c682e5e7b00bc7283b08af15198681
\ No newline at end of file

diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index 95e35ad74e2910ec89ce11c1a7d983a7019a1818..ff7c0968b8c4e58adb0cc9ae2e52c5c8b1fce64c 100644 (file)
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -504,7 +504,7 @@ struct Vdbe {
 #define SCHEMA_VERSION_BEGINTRANSDONE 10     /* After BeginTrans() */
 
 /* Call sqlite3_log() if "PRAGMA schema_version" is slower than this (in us) */
-#define SCHEMA_VERSION_TIMEOUT 2
+#define SCHEMA_VERSION_TIMEOUT 2000000
 
 /*
 ** The following are allowed values for Vdbe.eVdbeState