Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A129110742 for ; Tue, 7 May 2013 13:45:42 +0000 (UTC) Received: (qmail 10789 invoked by uid 500); 7 May 2013 13:45:42 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 10448 invoked by uid 500); 7 May 2013 13:45:39 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 10173 invoked by uid 99); 7 May 2013 13:45:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 May 2013 13:45:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C72ED8886B8; Tue, 7 May 2013 13:45:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: cqlsh: ninja-kill 'Perhaps you meant to use CQL X' warning Date: Tue, 7 May 2013 13:45:37 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 59bd0e716 -> 29ad6bdca cqlsh: ninja-kill 'Perhaps you meant to use CQL X' warning Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29ad6bdc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29ad6bdc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29ad6bdc Branch: refs/heads/cassandra-1.2 Commit: 29ad6bdca67f219c4bddb6e08dd629a2239a5909 Parents: 59bd0e7 Author: Aleksey Yeschenko Authored: Tue May 7 16:44:22 2013 +0300 Committer: Aleksey Yeschenko Committed: Tue May 7 16:44:22 2013 +0300 ---------------------------------------------------------------------- bin/cqlsh | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ad6bdc/bin/cqlsh ---------------------------------------------------------------------- diff --git a/bin/cqlsh b/bin/cqlsh index aa894b6..a29eee4 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -1008,15 +1008,6 @@ class Shell(cmd.Cmd): time.sleep(1*trynum) except cql.ProgrammingError, err: self.printerr(str(err)) - # try reparsing as cql3; if successful, suggest -3 - if self.cqlver_atleast(3): - if self.parseable_as_cql2(statement): - self.printerr("Perhaps you meant to use CQL 2? Try using" - " the -2 option when starting cqlsh.") - else: - if self.parseable_as_cql3(statement): - self.printerr("Perhaps you meant to use CQL 3? Try using" - " the -3 option when starting cqlsh.") return False except CQL_ERRORS, err: self.printerr(str(err))