natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-1.2' into trunk

This commit is contained in:
Aleksey Yeschenko 2013-05-07 16:45:51 +03:00
parent f1c9bc612e 29ad6bdca6
commit 3ca160ea72
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/cqlsh
View File

@ -958,15 +958,6 @@ class Shell(cmd.Cmd):
time.sleep(1*trynum) time.sleep(1*trynum)
except cql.ProgrammingError, err: except cql.ProgrammingError, err:
self.printerr(str(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 return False
except CQL_ERRORS, err: except CQL_ERRORS, err:
self.printerr(str(err)) self.printerr(str(err))