1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added new method to set string's charset

Browse Source
This commit is contained in:
bar@gw.udmsearch.izhnet.ru 2002-03-20 20:52:23 +04:00
parent 823d4da78b
commit 21ef10ef2e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/item_cmpfunc.cc
View File

@ -890,6 +890,9 @@ void in_string::set(uint pos,Item *item)
String *res=item->val_str(str); String *res=item->val_str(str);
if (res && res != str) if (res && res != str)
*str= *res; *str= *res;
// BAR TODO: I'm not sure this is absolutely correct
if (!str->charset())
str->set_charset(default_charset_info);
} }
byte *in_string::get_value(Item *item) byte *in_string::get_value(Item *item)

1
sql/sql_string.h
View File

@ -74,6 +74,7 @@ public:
{ sql_element_free(ptr_arg); } { sql_element_free(ptr_arg); }
~String() { free(); } ~String() { free(); }
inline void set_charset(CHARSET_INFO *charset) { str_charset=charset; }
inline CHARSET_INFO *charset() const { return str_charset; } inline CHARSET_INFO *charset() const { return str_charset; }
inline uint32 length() const { return str_length;} inline uint32 length() const { return str_length;}
inline uint32 alloced_length() const { return Alloced_length;} inline uint32 alloced_length() const { return Alloced_length;}