summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-05-21 21:39:58 +0300
committermonty@mashka.mysql.fi <>2003-05-21 21:39:58 +0300
commit6aa8929cf37374fe74c31eb03007961fa119213a (patch)
tree3df25ac7036fb4b2e95ab56b9dc90477ec234b7c /sql/sql_string.h
parentdd2b7918cdd5e0e643cff0305542ccd4aa8f1b6b (diff)
downloadmariadb-git-6aa8929cf37374fe74c31eb03007961fa119213a.tar.gz
After merge fixes
Added initialization of all important global variables
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 9c494600058..8212bd0a2bd 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -27,6 +27,9 @@
class String;
int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);
String *copy_if_not_alloced(String *a,String *b,uint32 arg_length);
+uint32 copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs,
+ const char *from, uint32 from_length,
+ CHARSET_INFO *from_cs);
class String
{