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

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Mikhail Stepura 2014-12-17 15:51:12 -08:00
parent 417563a59b f1e2fed8dd
commit 3c955f447c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -41,6 +41,7 @@
2.1.3
* (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
* Make sstablescrub check leveled manifest again (CASSANDRA-8432)
* Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
* Disable mmap on Windows (CASSANDRA-6993)

6
bin/cqlsh
View File

@ -987,8 +987,12 @@ class Shell(cmd.Cmd):
self.printerr(traceback.format_exc())
return False
if statement.query_string[:6].lower() == 'select' or statement.query_string.lower().startswith("list"):
if statement.query_string[:6].lower() == 'select':
self.print_result(rows, self.parse_for_table_meta(statement.query_string))
elif statement.query_string.lower().startswith("list users"):
self.print_result(rows, self.get_table_meta('system_auth','users'))
elif statement.query_string.lower().startswith("list"):
self.print_result(rows, self.get_table_meta('system_auth','permissions'))
elif rows:
# CAS INSERT/UPDATE
self.writeresult("")