From: drh Date: Fri, 30 Sep 2016 19:14:32 +0000 (+0000) Subject: Another simplification to the Parse object. X-Git-Tag: version-3.15.0~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e05950d8788b721565043405f26afa3e0a8fdf5c;p=thirdparty%2Fsqlite.git Another simplification to the Parse object. FossilOrigin-Name: c1419727f5e4cb3ef63b5853b6ef3b1e53af0651 --- diff --git a/manifest b/manifest index d09c186f8d..5f89cfbd3e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sunnecessary\sfields\sfrom\sthe\sParse\sobject. -D 2016-09-30T18:35:36.517 +C Another\ssimplification\sto\sthe\sParse\sobject. +D 2016-09-30T19:14:32.049 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f @@ -391,7 +391,7 @@ F src/shell.c b80396d2fadce4681397707e30078bf416e1dec2 F src/sqlite.h.in 2683a291ed8db5228024267be6421f0de507b80e F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae -F src/sqliteInt.h 8bf4d8ac59a393d2db34cd47c1f21e8f3efd49bc +F src/sqliteInt.h dea74ebe041661eb9a4924140c80b1731a4b5262 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 @@ -1525,7 +1525,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 47ae1cda8dc255d100aeb8cb90ea4c9e449509be -R 3a2fcadea5b6198ddf05a323497d9130 +P 814e41da3563eecf5514811bc8ab2df4f5cc0d4b +R 608d1a96b91ee96ffbbec71d9c1f3711 U drh -Z 7276f26b121b18d3ecda7a3236f1b99c +Z 828299b9894d67f8570c817a01bf6c81 diff --git a/manifest.uuid b/manifest.uuid index 82d4b6b1da..585ee1fd87 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -814e41da3563eecf5514811bc8ab2df4f5cc0d4b \ No newline at end of file +c1419727f5e4cb3ef63b5853b6ef3b1e53af0651 \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index cf4a253de7..7e8ee31ea7 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2955,7 +2955,6 @@ struct Parse { u8 declareVtab; /* True if inside sqlite3_declare_vtab() */ int nVtabLock; /* Number of virtual tables to lock */ #endif - int nAlias; /* Number of aliased result set columns */ int nHeight; /* Expression tree height of current sub-select */ #ifndef SQLITE_OMIT_EXPLAIN int iSelectId; /* ID of current select for EXPLAIN output */