From: larrybr Date: Sun, 4 Apr 2021 12:52:58 +0000 (+0000) Subject: Make shell .parameter feature type-agnostic. Hush harmless compiler warning. X-Git-Tag: version-3.36.0~268 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dabada6020f6ec10d43b40c73e35522f20c63da7;p=thirdparty%2Fsqlite.git Make shell .parameter feature type-agnostic. Hush harmless compiler warning. FossilOrigin-Name: 35cf295e026d067c9f059fde6b150e65163fe171d37501eb1e5742e691793340 --- diff --git a/manifest b/manifest index b9ab3b2aa4..f9c691b7d6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improved\srobustness\sto\sOOM\sconditions\sin\sthe\swindow\sfunction\slogic.\ndbsqlfuzz\s0c123f7d80b29beaafc8411c12129e46f7ffdac3. -D 2021-04-03T23:30:33.327 +C Make\sshell\s.parameter\sfeature\stype-agnostic.\sHush\sharmless\scompiler\swarning. +D 2021-04-04T12:52:58.015 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -494,7 +494,7 @@ F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c F src/delete.c 73f57a9a183532c344a3135cf8f2a5589376e39183e0b5f562d6b61b2af0f4d8 -F src/expr.c 1bf346b7efbe37f62aab7079fdc9ee1aa13e9bea29dbb161f9e7036db9df24e2 +F src/expr.c 9b03ea5c8a883dc892b5ea4f984089c911b91c0ea333be5316d64ec0100ec0f8 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4 F src/func.c 479f6929be027eb0210cbdde9d3529c012facf082d64a6b854a9415940761e5e @@ -543,7 +543,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c fc136d935f19966747663bed605ad7f06f84f9fe7bf7bf79e9bf844ef5c7556d F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92 F src/select.c 06df4a2a94df253b580d38b32573f4b6462fbe39abc31101c9a9fa95215c8479 -F src/shell.c.in dcce260883836c9b58847505fbccce8d5546af925046f7dacd9443e922ece036 +F src/shell.c.in 9320b476fde0f7c46700e5695b69b435f1e46843a1513cdd187ac426cdbee016 F src/sqlite.h.in 18ec33e32001721fd4e9c4705a24a85dff04956ac2c0a21775058884ba845b09 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e @@ -1912,7 +1912,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 1f66a85b7757754ff9aa0a626f66250c5fabc5fc8ab67bbc4b2ae8e6d9231a72 -R 1e7098a19e5ea3556c3efd668722aa00 -U drh -Z e3f39fba5a0b9648b23f7bff32aef6b3 +P 35ff7cbf547d41109b7cd4217a5439b3b4a1a4c310309c572c88f596fbc1b099 +R 6c0bb533f4343f80560612636080c44c +U larrybr +Z bcadad631b54c620265da7d8ff025bfa diff --git a/manifest.uuid b/manifest.uuid index d494141c65..7221e38b51 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -35ff7cbf547d41109b7cd4217a5439b3b4a1a4c310309c572c88f596fbc1b099 \ No newline at end of file +35cf295e026d067c9f059fde6b150e65163fe171d37501eb1e5742e691793340 \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index ac0f4073f1..63053547d1 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1677,7 +1677,7 @@ Select *sqlite3SelectDup(sqlite3 *db, Select *p, int flags){ ** NULL is returned. If non-NULL is returned, then it is guaranteed ** that the new entry was successfully appended. */ -static const struct ExprList_item zeroItem; +static const struct ExprList_item zeroItem = {0}; SQLITE_NOINLINE ExprList *sqlite3ExprListAppendNew( sqlite3 *db, /* Database handle. Used for memory allocation */ Expr *pExpr /* Expression to be appended. Might be NULL */ diff --git a/src/shell.c.in b/src/shell.c.in index 3e52e256fd..b3cc0599bd 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -2915,7 +2915,7 @@ static void bind_table_init(ShellState *p){ sqlite3_exec(p->db, "CREATE TABLE IF NOT EXISTS temp.sqlite_parameters(\n" " key TEXT PRIMARY KEY,\n" - " value ANY\n" + " value\n" ") WITHOUT ROWID;", 0, 0, 0); sqlite3_db_config(p->db, SQLITE_DBCONFIG_WRITABLE_SCHEMA, wrSchema, 0);