summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorbar@bar.mysql.r18.ru <>2002-11-06 17:43:22 +0400
committerbar@bar.mysql.r18.ru <>2002-11-06 17:43:22 +0400
commit2434be61f8bdf32af2f42f8aa0d758e27b1fc98b (patch)
treeda00e60b2fd7b0ab3f00cdd758ad27aac80f49ce /sql/sql_string.h
parent86b633379cdee7707b5dd69a3658e7ba1afa0946 (diff)
downloadmariadb-git-2434be61f8bdf32af2f42f8aa0d758e27b1fc98b.tar.gz
String->copy() now has a charset arg
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index c881cb22c5c..4ac4308f113 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -178,7 +178,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); // Allocate new string
+ bool copy(const char *s,uint32 arg_length, CHARSET_INFO *cs); // Allocate new string
bool append(const String &s);
bool append(const char *s,uint32 arg_length=0);
bool append(IO_CACHE* file, uint32 arg_length);