diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-10 08:28:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-10 08:28:13 +0200 |
| commit | 16c5c53fc21b162844c38a87ac48205448ca1d2f (patch) | |
| tree | 7a50437d5f9da772ec8aaacab322e5f6c13e7305 /sql/field.cc | |
| parent | f860b2aad41cd1b5ed0438ea211dcd78eec82b94 (diff) | |
| parent | ed418461614d912fbb114053508b3fb09b1fc2f0 (diff) | |
| download | mariadb-git-16c5c53fc21b162844c38a87ac48205448ca1d2f.tar.gz | |
mysql 5.5.23 merge
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index f5b43c69f63..d913e395b1a 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7860,8 +7860,7 @@ String *Field_set::val_str(String *val_buffer, ulonglong tmp=(ulonglong) Field_enum::val_int(); uint bitnr=0; - val_buffer->length(0); - val_buffer->set_charset(field_charset); + val_buffer->set("", 0, field_charset); while (tmp && bitnr < (uint) typelib->count) { if (tmp & 1) |