From: drh <drh@noemail.net>
Date: Mon, 6 Mar 2017 23:51:16 +0000 (+0000)
Subject: Make the default MASK argument for "PRAGMA optimize" be 0xfffe, to allow for
X-Git-Tag: version-3.18.0~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59dbe3a5efcd5ea47ef6038a861dc4d76838a43f;p=thirdparty%2Fsqlite.git

Make the default MASK argument for "PRAGMA optimize" be 0xfffe, to allow for
future expansion of up to 14 new default-on optimizations.

FossilOrigin-Name: 73019a8bba29fd07f73559cd00d5346fa822b439
---

diff --git a/manifest b/manifest
index 98be82eb72..6a2079f2af 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sa\scomment.\s\sNo\schanges\sto\scode.
-D 2017-03-06T20:44:13.809
+C Make\sthe\sdefault\sMASK\sargument\sfor\s"PRAGMA\soptimize"\sbe\s0xfffe,\sto\sallow\sfor\nfuture\sexpansion\sof\sup\sto\s14\snew\sdefault-on\soptimizations.
+D 2017-03-06T23:51:16.804
 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@ -390,7 +390,7 @@ F src/parse.y af8830094f4aecb91cb69721f3601ad10c36abc4
 F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
-F src/pragma.c d4aef42083d2d60760a736f758276638b976b702
+F src/pragma.c b7bf4f1dd9cdcdd3f72f0bdbce3502d69d0f48ba
 F src/pragma.h c9c763958fec92b04125571472c9500b351c5f7f
 F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 F src/printf.c 67427bbee66d891fc6f6f5aada857e9cdb368c1c
@@ -1562,7 +1562,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 137aeb2b160888100bc1e871b00860149e5f6196
-R f69eaa0284279e87544348aa447b8b6c
+P ec529bf11b16c801ea438e57d208ff7e4cedf1f9
+R 299bd0d883e4720337a781b64978238c
 U drh
-Z 0247be1d8d37c820f7663badba92934a
+Z 84b44db3e09ed739373a73b84fb9456e
diff --git a/manifest.uuid b/manifest.uuid
index 75989adcda..94998487fc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ec529bf11b16c801ea438e57d208ff7e4cedf1f9
\ No newline at end of file
+73019a8bba29fd07f73559cd00d5346fa822b439
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index aa7ebc8793..2901f4bdc5 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1892,10 +1892,10 @@ void sqlite3Pragma(
   **    0x0008    (Not yet implemented) Create indexes that might have
   **              been helpful to recent queries
   **
-  ** The default MASK is 0x000e, which means perform all of the optimizations
-  ** listed above except do not set Debug Mode.  New optimizations may be
-  ** added in future releases but they will be turned off by default.  The
-  ** default MASK will always be 0x0e.
+  ** The default MASK is and always shall be 0xfffe.  0xfffe means perform all    ** of the optimizations listed above except Debug Mode, including new
+  ** optimizations that have not yet been invented.  If new optimizations are
+  ** ever added that should be off by default, those off-by-default 
+  ** optimizations will have bitmasks of 0x10000 or larger.
   **
   ** DETERMINATION OF WHEN TO RUN ANALYZE
   **
@@ -1930,7 +1930,7 @@ void sqlite3Pragma(
       opMask = (u32)sqlite3Atoi(zRight);
       if( (opMask & 0x02)==0 ) break;
     }else{
-      opMask = 0xe;
+      opMask = 0xfffe;
     }
     iTabCur = pParse->nTab++;
     for(iDbLast = zDb?iDb:db->nDb-1; iDb<=iDbLast; iDb++){