Make sure the SQLITE_Stat34 optimization switch is always 0x800, a value

which is hard-coded in the TH3 test suite.

FossilOrigin-Name: 6aed4ea34c4163c682ad5bb2956fdf4f3a3ad048fefd3edab0fef6761c3783cc

diff --git a/manifest b/manifest
index 8d9fc53ff7d20ea8e244e9fa1b9ed685d0322e9b..010e54d3d6e7dc19bbd1e672e3731b8d699231a2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sunreachable\sconditionals\sand\srevise\sa\stestcase\sthat\swas\smade\sobsolete\sby\nthe\schanges\son\sthis\sbranch.
-D 2017-09-30T01:25:04.328
+C Make\ssure\sthe\sSQLITE_Stat34\soptimization\sswitch\sis\salways\s0x800,\sa\svalue\nwhich\sis\shard-coded\sin\sthe\sTH3\stest\ssuite.
+D 2017-09-30T10:50:34.309
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -464,7 +464,7 @@ F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220e
 F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a1fd3aa82f967da436164e0728a7d6841651fd0c6e27b9044e0eb9f6c8462e47
-F src/sqliteInt.h d51b1b549b6f64a44b0f5f5620aeb5bba414cf07704978238885b273ce2aa84f
+F src/sqliteInt.h 99e4beebd466495434ca6ed94bd7966a7f8c5879cd1f01768c588a5a2acd84c2
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -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 6b1651d711eae6e7c65a191f02ca2439160bcd677099712289e76a0f8422fd37
-R 3a66fd0c62efe88b91fd1bdc729b86a5
+P 71f0adf7ca6824c3aba69104b9976dbb71b377474529e1a36220b4804293501e
+R abcf7527b871a7332be788888884086b
 U drh
-Z 6d29940c14d977f820858db31a47d732
+Z a8cf074d964a4716a4bd6f57e83e01aa

diff --git a/manifest.uuid b/manifest.uuid
index 2da525fc6b4daf5104f82283cfda2471e6bcfef6..68015131370bd4384537fa8cbbd0cd498d302284 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-71f0adf7ca6824c3aba69104b9976dbb71b377474529e1a36220b4804293501e
\ No newline at end of file
+6aed4ea34c4163c682ad5bb2956fdf4f3a3ad048fefd3edab0fef6761c3783cc
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 9b45295e700071f3b34d912e8589799304e9b7f3..99c8b73748afda3f64b23e0ae649ca2b0b18694d 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1511,9 +1511,10 @@ struct sqlite3 {
 #define SQLITE_OrderByIdxJoin 0x0040   /* ORDER BY of joins via index */
 #define SQLITE_Transitive     0x0080   /* Transitive constraints */
 #define SQLITE_OmitNoopJoin   0x0100   /* Omit unused tables in joins */
-#define SQLITE_Stat34         0x0200   /* Use STAT3 or STAT4 data */
-#define SQLITE_CountOfView    0x0400   /* The count-of-view optimization */
-#define SQLITE_CursorHints    0x0800   /* Add OP_CursorHint opcodes */
+#define SQLITE_CountOfView    0x0200   /* The count-of-view optimization */
+#define SQLITE_CursorHints    0x0400   /* Add OP_CursorHint opcodes */
+#define SQLITE_Stat34         0x0800   /* Use STAT3 or STAT4 data */
+   /* TH3 expects the Stat34  ^^^^^^ value to be 0x0800.  Don't change it */
 #define SQLITE_AllOpts        0xffff   /* All optimizations */
 
 /*