diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2004-01-21 14:15:19 +0400 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2004-01-21 14:15:19 +0400 |
| commit | cf240e4ee83b39fbbccf92a35f394cb2793437a5 (patch) | |
| tree | 058a7d4f2f63504db9bb954a87f85a755f802179 /sql/sql_string.h | |
| parent | 53d6a088bcbab1777e32777e80a548b46f1140af (diff) | |
| download | mariadb-git-cf240e4ee83b39fbbccf92a35f394cb2793437a5.tar.gz | |
Further fixes for 2390: ucs2 alignment
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 8817aa8eab8..9c0900137e3 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -183,6 +183,9 @@ public: bool copy(); // Alloc string if not alloced bool copy(const String &s); // Allocate new string bool copy(const char *s,uint32 arg_length, CHARSET_INFO *cs); // Allocate new string + static bool needs_conversion(const char *s, uint32 arg_length, + CHARSET_INFO *cs_from, CHARSET_INFO *cs_to); + bool copy_aligned(const char *s, uint32 arg_length, CHARSET_INFO *cs); bool set_or_copy_aligned(const char *s, uint32 arg_length, CHARSET_INFO *cs); bool copy(const char*s,uint32 arg_length, CHARSET_INFO *csfrom, CHARSET_INFO *csto); |