From 6d013d890e0f2b6cc86e815c3adfdefa422b88ca Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 1 Jun 2022 13:32:05 +0000 Subject: [PATCH] Only include the code for sqlite_offset() if compiled with -DSQLITE_ENABLE_OFFSET_SQL_FUNC. FossilOrigin-Name: 382cd7e10b2df4216da8f25b55546bc74a963d9834af240f75ec8b8321ba106e --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/expr.c | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index bba794ebe2..400c587628 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\sWorker-specific\svariants\sof\sthe\smost\ssignificant\sDB-class\sJS\sbindings\sare\simplemented,\smost\snotably\svarious\suses\sof\sDB.exec(). -D 2022-06-01T11:20:07.553 +C Only\sinclude\sthe\scode\sfor\ssqlite_offset()\sif\scompiled\swith\n-DSQLITE_ENABLE_OFFSET_SQL_FUNC. +D 2022-06-01T13:32:05.631 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -521,7 +521,7 @@ F src/date.c 15082566229d4b1e5f24fdb490bf9bcc68824b911d70e3573ef075a1b9e2d26f F src/dbpage.c 90661a87e1db8bfbc8d2ebbdcd3749651ddb287c555c07a28fb17c7c591ffb68 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d F src/delete.c a8e844af211a48b13b5b358be77a12c860c6a557c21990ad51a548e2536500ce -F src/expr.c 67c0510697364c4f93aace305f47b229d7881fd11403fb0971ac8b27b3efef46 +F src/expr.c 69c833a8faa081f1a97c17cc40db15fd5295647b4885fa5d3efe93a46fc21a3b F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c d965ede15d8360c09ed59348940649ee647b192e784466837d7aefa836d1d91e F src/func.c 8f72e88cccdee22185133c10f96ccd61dc34c5ea4b1fa9a73c237ef59b2e64f1 @@ -1974,8 +1974,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 1c9812c458bd229c862efe5df1b64fae333da9871c8756b5ae4605a81bcda4b5 -R b028ebbd2fb0859e58130b8e01609e9c -U stephan -Z b5b92e7ff660a052d41c589f495d31e9 +P 371d6f7497016ca9bf82c8524b4d701ddf1e614b3fb4e69ff63935da0d51ed05 +R aaf57c756317bf4c95459d6e036b0bf6 +U drh +Z 09ba0e139c45241df99a2df10ee0b7dd # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 43587cf9de..ffe6868514 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -371d6f7497016ca9bf82c8524b4d701ddf1e614b3fb4e69ff63935da0d51ed05 \ No newline at end of file +382cd7e10b2df4216da8f25b55546bc74a963d9834af240f75ec8b8321ba106e \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index dcb5ee1717..09b56f4898 100644 --- a/src/expr.c +++ b/src/expr.c @@ -3955,6 +3955,7 @@ static int exprCodeInlineFunction( caseExpr.x.pList = pFarg; return sqlite3ExprCodeTarget(pParse, &caseExpr, target); } +#ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC case INLINEFUNC_sqlite_offset: { Expr *pArg = pFarg->a[0].pExpr; if( pArg->op==TK_COLUMN && pArg->iTable>=0 ){ @@ -3964,6 +3965,7 @@ static int exprCodeInlineFunction( } break; } +#endif default: { /* The UNLIKELY() function is a no-op. The result is the value ** of the first argument.