diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
| commit | 139a2b64bf8ec2e248656835e23a5c98ffc667a8 (patch) | |
| tree | 7d77d6f1073f8090f275b30cb3f10254497da243 /sql/my_decimal.cc | |
| parent | b3f7eac5301529c2d069ebe4d0558980412af3a2 (diff) | |
| parent | ce675406ca8dbc1532a908803a1371de8432d466 (diff) | |
| download | mariadb-git-139a2b64bf8ec2e248656835e23a5c98ffc667a8.tar.gz | |
Merge with 5.2
Diffstat (limited to 'sql/my_decimal.cc')
| -rw-r--r-- | sql/my_decimal.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc index 8b15ef4e586..2bbdeed2d87 100644 --- a/sql/my_decimal.cc +++ b/sql/my_decimal.cc @@ -109,6 +109,7 @@ int my_decimal2string(uint mask, const my_decimal *d, result= decimal2string((decimal_t*) d, (char*) str->ptr(), &length, (int)fixed_prec, fixed_dec, filler); + str->set_charset(&my_charset_bin); str->length(length); return check_result(mask, result); } |