diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-06-25 11:22:39 +0500 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-06-25 11:22:39 +0500 |
| commit | 2c53a70e1563a8c79262e7561ee3a33be6a01e01 (patch) | |
| tree | 51f8bb3f40e256f4c23e93a15a1db6dea249caa3 /sql/item.cc | |
| parent | a410744918cde0d11f119481ebca4058a82d2b9f (diff) | |
| download | mariadb-git-2c53a70e1563a8c79262e7561ee3a33be6a01e01.tar.gz | |
Bug#45485 replication different between master/slaver using procedure with gbk
In Item_param::set_from_user_var
value.cs_info.character_set_client is set
to 'fromcs' value. It's wrong, it should be set to
thd->variables.character_set_client.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index e693bf32f61..4c967200a3a 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -2771,8 +2771,8 @@ bool Item_param::set_from_user_var(THD *thd, const user_var_entry *entry) CHARSET_INFO *tocs= thd->variables.collation_connection; uint32 dummy_offset; - value.cs_info.character_set_of_placeholder= - value.cs_info.character_set_client= fromcs; + value.cs_info.character_set_of_placeholder= fromcs; + value.cs_info.character_set_client= thd->variables.character_set_client; /* Setup source and destination character sets so that they are different only if conversion is necessary: this will |