diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-03-17 13:40:40 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-03-17 13:40:40 +0400 |
| commit | 61ca875e7b14b5d91db1e6f07e4d13d3ba119a7a (patch) | |
| tree | 90019e029c91f3bd54f08f0c2ce61d0ac6a6f52d /sql/sql_string.cc | |
| parent | 3a407e58921ea1f0ce36e7d9b6bd1e7b723346dc (diff) | |
| download | mariadb-git-61ca875e7b14b5d91db1e6f07e4d13d3ba119a7a.tar.gz | |
sql_string.cc:
Copy as is if src or dst are binary
sql/sql_string.cc:
Copy as is if src or dst are binary
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index b6425003af3..d796c53fb52 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -232,6 +232,10 @@ bool String::copy(const char *str,uint32 arg_length, CHARSET_INFO *cs) bool String::copy(const char *str, uint32 arg_length, CHARSET_INFO *from_cs, CHARSET_INFO *to_cs) { + if ((from_cs == &my_charset_bin) || (to_cs == &my_charset_bin)) + { + return copy(str, arg_length, &my_charset_bin); + } uint32 new_length= to_cs->mbmaxlen*arg_length; if (alloc(new_length)) return TRUE; |