Merge branch 'cassandra-2.1' into trunk

2014-07-23 13:14:37 -05:00 · 2014-07-23 13:14:37 -05:00 · 6076f8ff32
parent f9e0210dbc f9fc846e9b
commit 6076f8ff32
1 changed files with 1 additions and 2 deletions
--- a/bin/cqlsh
+++ b/bin/cqlsh
@ -934,8 +934,7 @@ class Shell(cmd.Cmd):
        self.writeresult("")
        self.print_static_result(rows, cfMetaData)

-        self.writeresult("(%d rows)" % len(rows))
-        self.writeresult("")
+        self.writeresult("(%d rows)" % len(rows or []))

        if self.decoding_errors:
            for err in self.decoding_errors[:2]: