diff --git a/manifest b/manifest index 13139d928b..58d3a04285 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Very\sslightly\ssmaller\sand\sfaster. -D 2018-12-01T21:13:41.707 +C Omit\sa\sline\sof\scode\sthat\shas\sno\saffect\son\sthe\soutcome. +D 2018-12-02T01:15:16.933 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in a050c8670ea0d7b37b2192306cbb50d392acd9902b84e9b56f3444d006f97a6c @@ -504,7 +504,7 @@ F src/pragma.h fdd03d78a7497f74a3f652909f945328480089189526841ae829ce7313d98d13 F src/prepare.c f81f8d707e583192c28fea0b2e19385415b7d188123b23f49b038076408d7a69 F src/printf.c 0f1177cf1dd4d7827bf64d840768514ec76409abecaca9e8b577dbd065150381 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 -F src/resolve.c 4cfc44def0f0690ceaab8f6481f5d76284d7f9509aab6e218a679b4836a54614 +F src/resolve.c 976e7879286a1eecdc71ceff64f6d1b3f58c8f8096537ba668b3dc0887f410c1 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93 F src/select.c 61e867a906f140b73baf4ce7a201ad6dcba30820969f5618ee40e9a0d32c6f5f F src/shell.c.in 482e23a370cbe5b0d4c73a0f0f5fce34f7caa08a14a8d75e12f0225c4e14915c @@ -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 bf8c1b2b7a5960c282e543b9c293686dccff272512d08865f4600fb58238b4f9 -R 6e4818c911aa4ab70efb9a2cf2ccb395 +P 27798f17f567ad065f8a99effcb287bc241df7b450330ef890d192c70528e62b +R fc5314ff4e5a8de1b725ac2ced7d9c02 U drh -Z 8e5b93098d46384d408591fc5bd49035 +Z dc803f80871250c47b1ead21e4c26856 diff --git a/manifest.uuid b/manifest.uuid index a4307176ea..aac9cd9145 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -27798f17f567ad065f8a99effcb287bc241df7b450330ef890d192c70528e62b \ No newline at end of file +5d933aa659eb7a13f9ab44fe7762be292a1c3c75b957a3b7e0bc6188257b62f4 \ No newline at end of file diff --git a/src/resolve.c b/src/resolve.c index 0c7dfc0b25..effbe646fe 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -80,7 +80,7 @@ static void resolveAlias( if( pExpr->op==TK_COLLATE ){ pDup = sqlite3ExprAddCollateString(pParse, pDup, pExpr->u.zToken); } - ExprSetProperty(pDup, EP_Alias); +// ExprSetProperty(pDup, EP_Alias); /* Before calling sqlite3ExprDelete(), set the EP_Static flag. This ** prevents ExprDelete() from deleting the Expr structure itself,