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

check charsetnr flag as well

Browse Source
This commit is contained in:
Brian Lopez 2010-04-01 14:45:58 -07:00
parent bbf7585d09
commit b5f22d7c05
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/mysql2_ext.c
View File

@ -191,7 +191,8 @@ static VALUE rb_mysql_result_fetch_row(int argc, VALUE * argv, VALUE self) {
default: default:
val = rb_str_new(row[i], fieldLengths[i]); val = rb_str_new(row[i], fieldLengths[i]);
#ifdef HAVE_RUBY_ENCODING_H #ifdef HAVE_RUBY_ENCODING_H
if (fields[i].flags & BINARY_FLAG) { // rudimentary check for binary content
if ((fields[i].flags & BINARY_FLAG) || fields[i].charsetnr == 63) {
rb_enc_associate_index(val, binaryEncoding); rb_enc_associate_index(val, binaryEncoding);
} else { } else {
rb_enc_associate_index(val, utf8Encoding); rb_enc_associate_index(val, utf8Encoding);