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 cassandra-2.2

This commit is contained in:
Robert Stupp 2015-12-27 17:27:21 +01:00
parent 8287ebcb6a f1b9e9a65a
commit af509ec9a1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -8,6 +8,7 @@
* Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
* cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)
* Log error when stream session fails (CASSANDRA-9294)
* Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
* (cqlsh) further optimise COPY FROM (CASSANDRA-9302)

4
bin/cqlsh.py
View File

@ -738,6 +738,8 @@ class Shell(cmd.Cmd):
self.session.max_trace_wait = max_trace_wait
if encoding is None:
encoding = locale.getpreferredencoding()
if encoding is None:
encoding = 'utf-8'
self.encoding = encoding
self.output_codec = codecs.lookup(encoding)
@ -1035,7 +1037,7 @@ class Shell(cmd.Cmd):
def get_input_line(self, prompt=''):
if self.tty:
self.lastcmd = raw_input(prompt)
self.lastcmd = raw_input(prompt).decode(self.encoding)
line = self.lastcmd + '\n'
else:
self.lastcmd = self.stdin.readline()