From: drh Date: Thu, 26 Apr 2018 12:27:03 +0000 (+0000) Subject: Improved VDBE comment on the OP_Param opcode. No substantial changes. X-Git-Tag: version-3.24.0~90 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=896494e8ad691ac9302786a4dfcb97020ee1dc32;p=thirdparty%2Fsqlite.git Improved VDBE comment on the OP_Param opcode. No substantial changes. FossilOrigin-Name: 368c14da868a843767344f6cc17c499fddd83244c0510337ed9a918e64ee2413 --- diff --git a/manifest b/manifest index 911ec82612..b7531d4c76 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\s"fuzz_malloc.test"\sscript\sto\sprint\sSQL\sstatements\sin\swhich\sOOM\nhandling\sproblems\sare\sfound\sto\sstdout. -D 2018-04-26T08:56:40.175 +C Improved\sVDBE\scomment\son\sthe\sOP_Param\sopcode.\s\sNo\ssubstantial\schanges. +D 2018-04-26T12:27:03.691 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439 @@ -444,7 +444,7 @@ F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957 F src/dbpage.c 8db4c97f630e7d83f884ea75caf1ffd0988c160e9d530194d93721c80821e0f6 F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91 F src/delete.c b0f90749e22d5e41a12dbf940f4811138cf97da54b46b737089b93eb64a2896f -F src/expr.c 9a3b6eaa86c0e049d4da975972e62746383752ea4375a164c277ed49f70af277 +F src/expr.c 4a39bc2a9a3d825571519a1910ecfe3d4b6d596e775c9ed7cef7497ea06140ac F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c d617daf66b5515e2b42c1405b2b4984c30ca50fb705ab164271a9bf66c69e331 F src/func.c 94f42cba2cc1c34aeaa441022ba0170ec3fec4bba54db4e0ded085c6dc0fdc51 @@ -1725,7 +1725,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 7dd34e3776fed90a49344d54a1b68bb59f7957b5a8a1a367087b7cafb63111c1 -R 87ecaa91f6e5e22199ca34eced6f5939 -U dan -Z 215188660de40b918f194a41b8c6d741 +P a956363cf6881be590120c7718976b54b12c4bd0d9228d8142b45e0fe1826f7e +R 67e4930e9711eb625aa31c5083fa85ba +U drh +Z bd6cee7c5fa35b400b9c5a8450cb9640 diff --git a/manifest.uuid b/manifest.uuid index ed66c889c8..6175b6c3c8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a956363cf6881be590120c7718976b54b12c4bd0d9228d8142b45e0fe1826f7e \ No newline at end of file +368c14da868a843767344f6cc17c499fddd83244c0510337ed9a918e64ee2413 \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index 6513c5ec7f..03fad6cc52 100644 --- a/src/expr.c +++ b/src/expr.c @@ -4049,10 +4049,9 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){ assert( p1>=0 && p1<(pTab->nCol*2+2) ); sqlite3VdbeAddOp2(v, OP_Param, p1, target); - VdbeComment((v, "%s.%s -> $%d", + VdbeComment((v, "r[%d]=%s.%s", target, (pExpr->iTable ? "new" : "old"), - (pExpr->iColumn<0 ? "rowid" : pExpr->pTab->aCol[pExpr->iColumn].zName), - target + (pExpr->iColumn<0 ? "rowid" : pExpr->pTab->aCol[pExpr->iColumn].zName) )); #ifndef SQLITE_OMIT_FLOATING_POINT