From: dan <dan@noemail.net>
Date: Wed, 4 Oct 2017 12:08:35 +0000 (+0000)
Subject: Amend recent changes to busy.test to avoid failing with SQLITE_ENABLE_STAT4
X-Git-Tag: version-3.21.0~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c16760c373e24e2b6116086f4437ee6ee4c7861;p=thirdparty%2Fsqlite.git

Amend recent changes to busy.test to avoid failing with SQLITE_ENABLE_STAT4
builds.

FossilOrigin-Name: 9ff4944194c56b38843bc626dc51604db8e1ca8a0fd221e2d6f78c840d57c341
---

diff --git a/manifest b/manifest
index 23a196d039..ae0689f471 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Turn\srestriction\s20\son\sthe\squery\sflattener\sinto\san\sassert\ssince\sthe\ssituation\nrestricted\scan\sno\slonger\soccur\sbecause\sof\sthe\smore\saggressive\suse\sof\nco-routines.
-D 2017-10-04T12:06:31.705
+C Amend\srecent\schanges\sto\sbusy.test\sto\savoid\sfailing\swith\sSQLITE_ENABLE_STAT4\nbuilds.
+D 2017-10-04T12:08:35.867
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -633,7 +633,7 @@ F test/boundary4.test 89e02fa66397b8a325d5eb102b5806f961f8ec4b
 F test/btree01.test e08b3613540145b353f20c81cb18ead54ff12e0f
 F test/btree02.test fe69453d474d8154d19b904157ff1db4812fed99
 F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
-F test/busy.test bf7f099161793dd2e50b0e657c68840ac6ad19d4af2f34ba6702ace67a00040d
+F test/busy.test 510dc6daaad18bcbbc085bcc6217d6dc418def5e73f72ce1475eea0cb7834727
 F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 F test/cacheflush.test af25bb1509df04c1da10e38d8f322d66eceedf61
 F test/cachespill.test 895997f84a25b323b166aecb69baab2d6380ea98f9e0bcc688c4493c535cfab9
@@ -1655,7 +1655,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P fb83c3d8df250cb701fbe775b48ab93f5674496f68c57e04f50668c43c2de328
-R f3d3274b176630163255462be6322523
-U drh
-Z 54cf8654d3e3811fdefd23ba6c7d6b42
+P 4464f40ccd7c5553f4d44120ca6dac4e9445f08f083f7dcb3bd66b4413d818e0
+R 4c5ee8ddebc2e3331db784299bd3d5dd
+U dan
+Z 592fc1b29722b14ffc2bc21290e229f0
diff --git a/manifest.uuid b/manifest.uuid
index d079033e67..c47875e678 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4464f40ccd7c5553f4d44120ca6dac4e9445f08f083f7dcb3bd66b4413d818e0
\ No newline at end of file
+9ff4944194c56b38843bc626dc51604db8e1ca8a0fd221e2d6f78c840d57c341
\ No newline at end of file
diff --git a/test/busy.test b/test/busy.test
index e2f13cbebe..be0515b013 100644
--- a/test/busy.test
+++ b/test/busy.test
@@ -60,11 +60,11 @@ db2 close
 #-------------------------------------------------------------------------
 # Test that the busy-handler is invoked correctly for "PRAGMA optimize"
 # and ANALYZE commnds.
-ifcapable pragma&&analyze {
+ifcapable pragma&&analyze&&!stat4 {
 
 reset_db
 
-do_execsql_test 2.1 {
+do_execsql_test 3.1 {
   CREATE TABLE t1(x);
   CREATE TABLE t2(y);
   CREATE TABLE t3(z);
@@ -80,7 +80,7 @@ do_execsql_test 2.1 {
   SELECT * FROM t2 WHERE y=1;
 } {1 1}
 
-do_test 2.2 {
+do_test 3.2 {
   sqlite3 db2 test.db
   execsql { BEGIN EXCLUSIVE } db2
   catchsql { PRAGMA optimize }
@@ -92,11 +92,11 @@ proc busy_handler {n} {
 }
 db busy busy_handler
 
-do_test 2.3 {
+do_test 3.3 {
   catchsql { PRAGMA optimize }
 } {0 {}}
 
-do_test 2.4 {
+do_test 3.4 {
   execsql {
     BEGIN;
     SELECT count(*) FROM sqlite_master;
@@ -104,11 +104,11 @@ do_test 2.4 {
 } {6}
 
 proc busy_handler {n} { return 1 }
-do_test 2.5 {
+do_test 3.5 {
   catchsql { PRAGMA optimize }
 } {0 {}}
 
-do_test 2.6 {
+do_test 3.6 {
   execsql { COMMIT } db2
   execsql {
     WITH s(i) AS (
@@ -122,7 +122,7 @@ do_test 2.6 {
   } db2
 } {6}
 
-do_test 2.7 {
+do_test 3.7 {
   catchsql { PRAGMA optimize }
 } {1 {database is locked}}
 
@@ -130,7 +130,7 @@ proc busy_handler {n} {
   if {$n>1000} { execsql { COMMIT } db2 }
   return 0
 }
-do_test 2.8 {
+do_test 3.8 {
   catchsql { PRAGMA optimize }
 } {0 {}}