diff options
| author | konstantin@mysql.com <> | 2004-11-05 21:02:12 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2004-11-05 21:02:12 +0300 |
| commit | eeeb342b3ca5180c58fbf0e6d3ccde442e5cadc7 (patch) | |
| tree | 6738b37fb296ec7a84e8500b9844819a5485af6b /sql/item.cc | |
| parent | 954f88db9f04a9114fea7f169cbdc2425573654f (diff) | |
| download | mariadb-git-eeeb342b3ca5180c58fbf0e6d3ccde442e5cadc7.tar.gz | |
A fix and test case for the bug reported by Reggie: if character set
of client equals to character set of connection, possibly required
conversion to character set of column is not performed
(prepared statements, data is supplied using placeholders).
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index 7dc7e9e542c..b4e7322b7cc 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1218,6 +1218,10 @@ bool Item_param::convert_str_value(THD *thd) value.cs_info.character_set_client, value.cs_info.final_character_set_of_str_value); } + else + str_value.set_charset(value.cs_info.final_character_set_of_str_value); + /* Here str_value is guaranteed to be in final_character_set_of_str_value */ + max_length= str_value.length(); decimals= 0; /* |