aboutsummaryrefslogtreecommitdiff
path: root/src/resolve.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2015-08-26 18:04:23 +0000
committerdrh <drh@noemail.net>2015-08-26 18:04:23 +0000
commite14796085a8f0751f5e9d05165deb224cb9f72d6 (patch)
treeee22d7b43bf84944ef305fed105b5ec7ebe95349 /src/resolve.c
parent760b32dff2985d46205c1cd6e1ea6634e347201b (diff)
parent5579d59fb3ccb9e9db9913a5bd50871d8e893d95 (diff)
downloadsqlite-e14796085a8f0751f5e9d05165deb224cb9f72d6.tar.gz
sqlite-e14796085a8f0751f5e9d05165deb224cb9f72d6.zip
Merge enhancements from trunk.
FossilOrigin-Name: ec6ddb3d481d005c304a26c948c9c808586750e9
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 a85543f09..eb4339645 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -407,9 +407,9 @@ static int lookupName(
** resolved by the time the WHERE clause is resolved.
**
** The ability to use an output result-set column in the WHERE, GROUP BY,
- ** or HAVING clauses, or as part of a larger expression in the ORDRE BY
+ ** or HAVING clauses, or as part of a larger expression in the ORDER BY
** clause is not standard SQL. This is a (goofy) SQLite extension, that
- ** is supported for backwards compatibility only. TO DO: Issue a warning
+ ** is supported for backwards compatibility only. Hence, we issue a warning
** on sqlite3_log() whenever the capability is used.
*/
if( (pEList = pNC->pEList)!=0