From: drh <> Date: Mon, 18 Apr 2022 19:48:31 +0000 (+0000) Subject: Disable the unused EU4_EXPR mode for the IdList object. X-Git-Tag: version-3.39.0~206^2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f80bb195b3ad5328a74455b34216b1ce0c719ff5;p=thirdparty%2Fsqlite.git Disable the unused EU4_EXPR mode for the IdList object. FossilOrigin-Name: 5bcf4aa3bf6b1b9f47142bc37683bb3bf0adeffd052d07449af7c9b415add052 --- diff --git a/manifest b/manifest index ac054ce787..bd5ae8fad1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Even\smore\stest\scases. -D 2022-04-18T19:34:41.878 +C Disable\sthe\sunused\sEU4_EXPR\smode\sfor\sthe\sIdList\sobject. +D 2022-04-18T19:48:31.484 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -495,7 +495,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6 F src/btree.c df695e953c2ce78ce4878ee5016751df9bc9a921dc0500a0f53ab3bb3196e505 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e -F src/build.c f7098ca5006891b1877fb2e8f9aa52243338983696123f5a4e30fa9dda06debc +F src/build.c 7f4286d2b4c4ed013e8e064f958f10c277126085f7918c306e9f54c238b36393 F src/callback.c 4c19af69835787bfe790ac560f3071a824eb629f34e41f97b52ce5235c77de1c F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c 026dbdcdbd8c3cde98a88483ee88310ff43150ab164ad768f12cc700a11495ad @@ -557,7 +557,7 @@ F src/shell.c.in ecff6f4ab0e8e25acd578b3eb27ac0bad4d48643c160259a277151d6e9d412e F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e -F src/sqliteInt.h afec51781b0ff21126c4cbd812be873f801810fef7ecee6c11e56ab85c6fe577 +F src/sqliteInt.h e748c9855541432874b37dbf11550d46ea66cac3958857dad4643fc48308d398 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657 F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 @@ -1948,8 +1948,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P e34250efd34b526373bf072a43a7984ca19690836d7d2464dea8338066eaee8f -R 69108f498c0556000e4436e5f3e7a04b +P 5f4310a104443ac3fc56f9d9cd2d428dd3e7a2a0285c8e74de6f499439fd6868 +R 733c72f2d655615b5133b4dde2b9b4c2 U drh -Z 659794332d44475059e268cfdb5be5e9 +Z d36c5cf3e20140eaf0c13a45e8b8e619 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7b0c55236e..33260b53b1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5f4310a104443ac3fc56f9d9cd2d428dd3e7a2a0285c8e74de6f499439fd6868 \ No newline at end of file +5bcf4aa3bf6b1b9f47142bc37683bb3bf0adeffd052d07449af7c9b415add052 \ No newline at end of file diff --git a/src/build.c b/src/build.c index 126897c856..1c632c94ed 100644 --- a/src/build.c +++ b/src/build.c @@ -4695,12 +4695,10 @@ IdList *sqlite3IdListAppend(Parse *pParse, IdList *pList, Token *pToken){ */ void sqlite3IdListDelete(sqlite3 *db, IdList *pList){ int i; - int delExpr; if( pList==0 ) return; - delExpr = pList->eU4==EU4_EXPR; + assert( pList->eU4!=EU4_EXPR ); /* EU4_EXPR mode is not currently used */ for(i=0; inId; i++){ sqlite3DbFree(db, pList->a[i].zName); - if( delExpr ) sqlite3ExprDelete(db, pList->a[i].u4.pExpr); } sqlite3DbFreeNN(db, pList); } diff --git a/src/sqliteInt.h b/src/sqliteInt.h index bc618df7df..9363adbb9f 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -3044,7 +3044,7 @@ struct IdList { char *zName; /* Name of the identifier */ union { int idx; /* Index in some Table.aCol[] of a column named zName */ - Expr *pExpr; /* Expr to implement a USING variable */ + Expr *pExpr; /* Expr to implement a USING variable -- NOT USED */ } u4; } a[1]; }; @@ -3055,7 +3055,7 @@ struct IdList { */ #define EU4_NONE 0 /* Does not use IdList.a.u4 */ #define EU4_IDX 1 /* Uses IdList.a.u4.idx */ -#define EU4_EXPR 2 /* Uses IdList.a.u4.pExpr */ +#define EU4_EXPR 2 /* Uses IdList.a.u4.pExpr -- NOT CURRENTLY USED */ /* ** The SrcItem object represents a single term in the FROM clause of a query.