diff options
| author | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-05-20 21:56:27 +0500 |
|---|---|---|
| committer | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-05-20 21:56:27 +0500 |
| commit | 1b49cd8ca1391d5141750fae62fa0c9c13da6e86 (patch) | |
| tree | f5be2b3786bb3031d9c1a02b1394c675f1110426 /sql | |
| parent | 1afa4558563c758277052520f811d665845a223c (diff) | |
| download | mariadb-git-1b49cd8ca1391d5141750fae62fa0c9c13da6e86.tar.gz | |
Bug fix: charset was not initialized
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_string.cc | 1 | ||||
| -rw-r--r-- | sql/sql_string.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index b222d3394eb..c05a7b85f77 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -203,6 +203,7 @@ bool String::copy(const String &str) str_length=str.str_length; bmove(Ptr,str.Ptr,str_length); // May be overlapping Ptr[str_length]=0; + str_charset=str.str_charset; return FALSE; } diff --git a/sql/sql_string.h b/sql/sql_string.h index 68c5e005782..5e5c9001590 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -46,6 +46,7 @@ public: String(uint32 length_arg) { alloced=0; Alloced_length=0; (void) real_alloc(length_arg); + str_charset=default_charset_info; } String(const char *str, CHARSET_INFO *cs) { |