aboutsummaryrefslogtreecommitdiff
path: root/src/resolve.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2016-02-25 18:54:30 +0000
committerdrh <drh@noemail.net>2016-02-25 18:54:30 +0000
commitd3e1af4aa04113b379050119e0015ada3078cc4e (patch)
treed12ed8d1907415a474cf321b76498befd1312fc9 /src/resolve.c
parent7f219fad58bb84f5e856134a7b6909c8c0482c9b (diff)
parenteecb80e77e3556e9373237eff6ab0a8dad7eb5fb (diff)
downloadsqlite-d3e1af4aa04113b379050119e0015ada3078cc4e.tar.gz
sqlite-d3e1af4aa04113b379050119e0015ada3078cc4e.zip
Merge all the latest changes from trunk.
FossilOrigin-Name: b86590043e17705ada90562cf30f69b3e3ef65a4
Diffstat (limited to 'src/resolve.c')
-rw-r--r--src/resolve.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resolve.c b/src/resolve.c
index 81bb712a2..8e290af12 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -656,9 +656,9 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
notValid(pParse, pNC, "functions", NC_PartIdx);
zId = pExpr->u.zToken;
nId = sqlite3Strlen30(zId);
- pDef = sqlite3FindFunction(pParse->db, zId, nId, n, enc, 0);
+ pDef = sqlite3FindFunction(pParse->db, zId, n, enc, 0);
if( pDef==0 ){
- pDef = sqlite3FindFunction(pParse->db, zId, nId, -2, enc, 0);
+ pDef = sqlite3FindFunction(pParse->db, zId, -2, enc, 0);
if( pDef==0 ){
no_such_func = 1;
}else{