From: drh <drh@noemail.net>
Date: Mon, 3 Apr 2017 13:33:51 +0000 (+0000)
Subject: Force a schema load prior to "PRAGMA optimize".
X-Git-Tag: version-3.19.0~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=761f691d0ecf5dba25698aefc1012531bc368bc2;p=thirdparty%2Fsqlite.git

Force a schema load prior to "PRAGMA optimize".

FossilOrigin-Name: 86897c24c0b35ffea8df72d86a099addf67de210c6568aaba22ef92f1a60c3cf
---

diff --git a/manifest b/manifest
index e817e1e57f..0fff1f86cd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypos\sin\sthe\sdocumentation\sfor\sOP_Column.
-D 2017-04-03T13:17:31.089
+C Force\sa\sschema\sload\sprior\sto\s"PRAGMA\soptimize".
+D 2017-04-03T13:33:51.502
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
@@ -395,7 +395,7 @@ F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
 F src/pragma.c 2b244434e76c7075edbcfd9e4d634899af0944ff01183b126d4671f7407c2368
-F src/pragma.h c9c763958fec92b04125571472c9500b351c5f7f
+F src/pragma.h 37a1311d0388db480388d7ec09054f7103045eff20d4971f8a433b77f40b9921
 F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
@@ -1507,7 +1507,7 @@ F tool/mkmsvcmin.tcl 95b37e202cbed873aa8ffdbb493b9db45927be2b
 F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
 F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
-F tool/mkpragmatab.tcl 2ffe6d5fdc2d3381621d6c77978ba054466e757f
+F tool/mkpragmatab.tcl 32bb40741df11bddc8451de9ea4d130e7b4476d8064794b1cf402ac110840fba
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
 F tool/mksqlite3c.tcl 06b2e6a0f21cc0a5d70fbbd136b3e0a96470645e
@@ -1569,7 +1569,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 84fa069c5bdfe41d03d03875c9157cc6785150b677c04e40b8916ba5af073dc8
-R 712574d4524a4e566586181081140bf0
+P 777b43e64ffb2fb80ba7b705c129c133bf9787993a66cde1759dc070b324b4b4
+R 9a743d9771b82de1d9bbf28369abee2c
 U drh
-Z 0dbc639fc4406be2788a574780c7997d
+Z 64ccfe96d48e9643ce5426be1683d306
diff --git a/manifest.uuid b/manifest.uuid
index 7e8c18ad23..37505706dc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-777b43e64ffb2fb80ba7b705c129c133bf9787993a66cde1759dc070b324b4b4
\ No newline at end of file
+86897c24c0b35ffea8df72d86a099addf67de210c6568aaba22ef92f1a60c3cf
\ No newline at end of file
diff --git a/src/pragma.h b/src/pragma.h
index 9b1c723b3e..d05657c799 100644
--- a/src/pragma.h
+++ b/src/pragma.h
@@ -417,7 +417,7 @@ static const PragmaName aPragmaName[] = {
 #endif
  {/* zName:     */ "optimize",
   /* ePragTyp:  */ PragTyp_OPTIMIZE,
-  /* ePragFlg:  */ PragFlg_Result1,
+  /* ePragFlg:  */ PragFlg_Result1|PragFlg_NeedSchema,
   /* ColNames:  */ 0, 0,
   /* iArg:      */ 0 },
 #if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
diff --git a/tool/mkpragmatab.tcl b/tool/mkpragmatab.tcl
index 59b245cc76..080e3da003 100644
--- a/tool/mkpragmatab.tcl
+++ b/tool/mkpragmatab.tcl
@@ -363,7 +363,7 @@ set pragma_def {
   FLAG: Result0
 
   NAME: optimize
-  FLAG: Result1
+  FLAG: Result1 NeedSchema
 }
 
 # Open the output file