diff options
| author | monty@mashka.mysql.fi <> | 2003-05-21 21:39:58 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-05-21 21:39:58 +0300 |
| commit | 6aa8929cf37374fe74c31eb03007961fa119213a (patch) | |
| tree | 3df25ac7036fb4b2e95ab56b9dc90477ec234b7c /sql/sql_string.cc | |
| parent | dd2b7918cdd5e0e643cff0305542ccd4aa8f1b6b (diff) | |
| download | mariadb-git-6aa8929cf37374fe74c31eb03007961fa119213a.tar.gz | |
After merge fixes
Added initialization of all important global variables
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index ca38651b3b6..bd101944160 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -34,9 +34,6 @@ CHARSET_INFO *national_charset_info= &my_charset_utf8; extern gptr sql_alloc(unsigned size); extern void sql_element_free(void *ptr); -static uint32 -copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, - const char *from, uint32 from_length, CHARSET_INFO *from_cs); #include "sql_string.h" @@ -630,7 +627,7 @@ String *copy_if_not_alloced(String *to,String *from,uint32 from_length) */ -static uint32 +uint32 copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, const char *from, uint32 from_length, CHARSET_INFO *from_cs) { |