Github user jaltekruse commented on the pull request: https://github.com/apache/drill/pull/178#issuecomment-144819302 The change looks good, but thinking about this a little more it might make sense to fix this a little higher up the chain. If we fix this where queries are actually accepted by the Drill server, then this same fix would also apply to the JDBC and C++ interfaces. I believe the only reason this happens to work with sqlline is because it is stripping it off on the client before sending the query. As long as we're making a change on the server, I think we should put it as close to actual execution as possible. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---