diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-10-28 12:17:46 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-10-28 12:17:46 +0400 |
| commit | 9290a5805bee045e144bde03731d54eb66f567d1 (patch) | |
| tree | 01af3257849b9eecb582e3bdaeae5a1bf2cc4f39 /sql/field.cc | |
| parent | 91edb6f7e6037052b064bb21922c3533b8b53106 (diff) | |
| download | mariadb-git-9290a5805bee045e144bde03731d54eb66f567d1.tar.gz | |
Merging more ctype_* tests from MySQL-5.6.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index c4f3db039c4..87170b50035 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -2816,7 +2816,7 @@ int Field_new_decimal::store(const char *from, uint length, &decimal_value)) && thd->abort_on_warning) { - ErrConvString errmsg(from, length, &my_charset_bin); + ErrConvString errmsg(from, length, charset_arg); push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD), @@ -2836,7 +2836,7 @@ int Field_new_decimal::store(const char *from, uint length, break; case E_DEC_BAD_NUM: { - ErrConvString errmsg(from, length, &my_charset_bin); + ErrConvString errmsg(from, length, charset_arg); push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD), |