aboutsummaryrefslogtreecommitdiff
path: root/src/resolve.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2014-09-06 16:52:18 +0000
committerdan <dan@noemail.net>2014-09-06 16:52:18 +0000
commit3fdf46a16e592de482a81721ff32e85b6d50006a (patch)
tree2f86622762529bf3123bf0519e7df7343e5be7b6 /src/resolve.c
parent2ee53412888324b00964a8766f4f78ccc80218a9 (diff)
parent60ec914c74ec79e4b73c004d1c21330be7916c99 (diff)
downloadsqlite-3fdf46a16e592de482a81721ff32e85b6d50006a.tar.gz
sqlite-3fdf46a16e592de482a81721ff32e85b6d50006a.zip
Merge latest trunk changes with this branch.
FossilOrigin-Name: 9dca7ce55797b3eb617859f6189c1a2ec6f66566
Diffstat (limited to 'src/resolve.c')
-rw-r--r--src/resolve.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resolve.c b/src/resolve.c
index 935d31134..a77fd9d36 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1118,7 +1118,7 @@ static int resolveOrderGroupBy(
}
/*
-** Resolve names in the SELECT statement p and all of its descendents.
+** Resolve names in the SELECT statement p and all of its descendants.
*/
static int resolveSelectStep(Walker *pWalker, Select *p){
NameContext *pOuterNC; /* Context that contains this SELECT */