summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2002-11-11 16:46:11 +0400
committerunknown <bar@bar.mysql.r18.ru>2002-11-11 16:46:11 +0400
commit50b32edc76d476a812a14727ccdfece3f85c7c72 (patch)
treee63a26f3f0b8a8e7d401794fb66783ccbc48b07d /sql/sql_string.h
parent4fb279493a56ce129ef0a085798b0bd56ed598a4 (diff)
downloadmariadb-git-50b32edc76d476a812a14727ccdfece3f85c7c72.tar.gz
thread charset related improvements
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 4ac4308f113..d9dce95e0a2 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -179,6 +179,7 @@ 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
+ bool copy(const char*s,uint32 arg_length, CHARSET_INFO *csfrom, CHARSET_INFO *csto);
bool append(const String &s);
bool append(const char *s,uint32 arg_length=0);
bool append(IO_CACHE* file, uint32 arg_length);