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 <[email protected]> Authored: Tue May 7 16:44:22 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> 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))
