From: drh Date: Wed, 28 Nov 2018 01:45:05 +0000 (+0000) Subject: Always enable SQLITE_ENABLE_DESERIALIZE for the MSVC makefile as this is necessary X-Git-Tag: version-3.26.0~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6fa95b81dab6ce35396769f5984d68c83f2bf2c;p=thirdparty%2Fsqlite.git Always enable SQLITE_ENABLE_DESERIALIZE for the MSVC makefile as this is necessary to get releasetest.tcl to work. FossilOrigin-Name: d362dedba3637013d654f2a890fc7b61476f2adeb6bf3bffb4e715c1d1d0b7c2 --- diff --git a/Makefile.msc b/Makefile.msc index 8cc51a2034..e3feffab35 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -345,6 +345,7 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_INTROSPECTION_PRAGMAS=1 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1 !ENDIF OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1 !ENDIF diff --git a/manifest b/manifest index 32522c0b11..2515cee27b 100644 --- a/manifest +++ b/manifest @@ -1,10 +1,10 @@ -C Fix\sa\sfailing\sassert()\sin\ssqlite3ResetAllSchemasOfConnection(). -D 2018-11-27T19:47:55.193 +C Always\senable\sSQLITE_ENABLE_DESERIALIZE\sfor\sthe\sMSVC\smakefile\sas\sthis\sis\snecessary\nto\sget\sreleasetest.tcl\sto\swork. +D 2018-11-28T01:45:05.333 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 15f0851eb3754e37de848d5f8ab24146cf677b44ac38353a2c23e39c999aa422 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 -F Makefile.msc 071853dfc2148aadaeb7a153b9986cc9d71b7f256874f79b119f97a4c89453f5 +F Makefile.msc 0d6831ff7951b302e888d86d4c469e2ec3c22f59eba4118b8c38d5a51d9e2d4f F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee F VERSION 654da1d4053fb09ffc33a3910e6d427182a7dcdc67e934fa83de2849ac83fccb F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@ -1779,7 +1779,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 3c893d9bcc34c391505b08cc35808dd3abddf3c5d952798334c296547bcae6a6 -R a3c0bfdd76fb1abe417d12a91569ab36 -U dan -Z d3c8331166b85492ba2276342def22fb +P 0ea049f342d11c676e148239e45d252164081362e921a4beb735d6899eb77344 +R 5b2bedbde38622eb3b4b8e0ce1595cd8 +U drh +Z 19d2adb068a71d48f3c35d776d8cde00 diff --git a/manifest.uuid b/manifest.uuid index 3b7a2dc31f..702c117799 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0ea049f342d11c676e148239e45d252164081362e921a4beb735d6899eb77344 \ No newline at end of file +d362dedba3637013d654f2a890fc7b61476f2adeb6bf3bffb4e715c1d1d0b7c2 \ No newline at end of file