diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-03-21 14:56:29 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-03-21 14:56:29 +0200 |
| commit | b3099b51fa1e9b8534709e7b70fb36aba0b7e38d (patch) | |
| tree | 7832d5a801977c3c0d42a4b4a5d4869308150aed /sql | |
| parent | 70207671eb5408cc159c4c440de89416307d0fb0 (diff) | |
| parent | 605797313d34a3418ef2d189e95e0963118ac9d5 (diff) | |
| download | mariadb-git-b3099b51fa1e9b8534709e7b70fb36aba0b7e38d.tar.gz | |
merge mysql-5.5->mysql-5.5-security
Diffstat (limited to 'sql')
| -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 ef66c1ba9bb..59eb83da5fa 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8257,8 +8257,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) |