From: drh <drh@noemail.net>
Date: Wed, 23 Nov 2016 14:19:11 +0000 (+0000)
Subject: Correctly display the names of SQL functions in the VDBE_PROFILE output.
X-Git-Tag: version-3.16.0~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30642cf4d2007a9832e6325290ed96f42e396a98;p=thirdparty%2Fsqlite.git

Correctly display the names of SQL functions in the VDBE_PROFILE output.

FossilOrigin-Name: 161192f17273f32f1b3b82d41135aaca047e9a83
---

diff --git a/manifest b/manifest
index abe18f7860..aea8bb2bc4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\snew\srequirement\smark\sfor\sCAST\sexpressions.
-D 2016-11-22T20:29:05.473
+C Correctly\sdisplay\sthe\snames\sof\sSQL\sfunctions\sin\sthe\sVDBE_PROFILE\soutput.
+D 2016-11-23T14:19:11.143
 F Makefile.in 6b572807415d3f0a379cebc9461416d8df4a12c8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc bb4d970894abbbe0e88d00aac29bd52af8bc95f4
@@ -458,7 +458,7 @@ F src/vdbe.c e76ee960a2e6d099838173599ae2d0999dc3aa63
 F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
 F src/vdbeInt.h 29b25318a0286c4b2599c0fbef6acf524398489a
 F src/vdbeapi.c 97129bec6b1553da50d8e73f523c278bda66d9f6
-F src/vdbeaux.c 52d9b840859f260ce8418be9333dd77c902e1c74
+F src/vdbeaux.c c0adf6e1ce14e0b511fbeb71aa3ef1d603051b71
 F src/vdbeblob.c ba5b57b9fa47b320ad5c46468e77d8660c931190
 F src/vdbemem.c fcdd73a2001a673f48a244a77b1038928ae729c9
 F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
@@ -1534,7 +1534,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 f5ac98efb5d5f7751c5c560bed9c7885e60ac4bc
-R 7f4eeea43dc88b31022d41b7c5421073
+P bee2859b953c935c413de2917588159d03c672d9
+R 2c4c0cbde8a5576e7dee09bc8f314063
 U drh
-Z a9cabf6ebd1d5980aefc6cb67510aa1c
+Z d768832216e311c9257ef81108e44f2d
diff --git a/manifest.uuid b/manifest.uuid
index c87379ecc7..ef0d8075a9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bee2859b953c935c413de2917588159d03c672d9
\ No newline at end of file
+161192f17273f32f1b3b82d41135aaca047e9a83
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 596ab30c7b..66e076e4c8 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1271,7 +1271,7 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){
       sqlite3XPrintf(&x, "%s(%d)", pDef->zName, pDef->nArg);
       break;
     }
-#ifdef SQLITE_DEBUG
+#if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE)
     case P4_FUNCCTX: {
       FuncDef *pDef = pOp->p4.pCtx->pFunc;
       sqlite3XPrintf(&x, "%s(%d)", pDef->zName, pDef->nArg);