Commit 1b49cd8c authored by unknown's avatar unknown

Bug fix: charset was not initialized

parent 1afa4558
...@@ -203,6 +203,7 @@ bool String::copy(const String &str) ...@@ -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: ...@@ -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)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment