mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
Bug fix: charset was not initialized
This commit is contained in:
parent
1afa455856
commit
1b49cd8ca1
2 changed files with 2 additions and 0 deletions
|
@ -203,6 +203,7 @@ bool String::copy(const String &str)
|
||||||
str_length=str.str_length;
|
str_length=str.str_length;
|
||||||
bmove(Ptr,str.Ptr,str_length); // May be overlapping
|
bmove(Ptr,str.Ptr,str_length); // May be overlapping
|
||||||
Ptr[str_length]=0;
|
Ptr[str_length]=0;
|
||||||
|
str_charset=str.str_charset;
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,7 @@ public:
|
||||||
String(uint32 length_arg)
|
String(uint32 length_arg)
|
||||||
{
|
{
|
||||||
alloced=0; Alloced_length=0; (void) real_alloc(length_arg);
|
alloced=0; Alloced_length=0; (void) real_alloc(length_arg);
|
||||||
|
str_charset=default_charset_info;
|
||||||
}
|
}
|
||||||
String(const char *str, CHARSET_INFO *cs)
|
String(const char *str, CHARSET_INFO *cs)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue