github-migration
/
mysql2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only set binary ruby encoding on fields that have a binary flag *and* encoding set

This commit is contained in:
Brian Lopez 2010-10-31 12:11:20 -07:00
parent 1057f976d0
commit 2b37ace3dc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/mysql2/result.c
View File

@ -248,7 +248,7 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
val = rb_str_new(row[i], fieldLengths[i]);
#ifdef HAVE_RUBY_ENCODING_H
// if binary flag is set, respect it's wishes
if (fields[i].flags & BINARY_FLAG) {
if (fields[i].flags & BINARY_FLAG && fields[i].charsetnr == 63) {
rb_enc_associate(val, binaryEncoding);
} else {
// lookup the encoding configured on this field