diff options
| author | bar@bar.intranet.mysql.r18.ru <> | 2004-01-21 14:15:19 +0400 |
|---|---|---|
| committer | bar@bar.intranet.mysql.r18.ru <> | 2004-01-21 14:15:19 +0400 |
| commit | 03d00c7da907f7df22729f3795e49d025f1049af (patch) | |
| tree | 058a7d4f2f63504db9bb954a87f85a755f802179 /sql/sql_string.h | |
| parent | 237d655e12585621f16770fed32b456241dda8f3 (diff) | |
| download | mariadb-git-03d00c7da907f7df22729f3795e49d025f1049af.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); |