diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:04:40 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:04:40 +0200 |
| commit | a04157fbb3f2b2e054c02968ffc82bb0eb971d58 (patch) | |
| tree | db1cb9732cc2b568c4a56c3f6d11cf8f4d5250b6 /sql/sql_string.h | |
| parent | 205f7a0583f5ba5cc0c6428fa6e44c74b534d8e8 (diff) | |
| parent | 9d3fda77c8e20ff299f9750b64c42dfbb58a7806 (diff) | |
| download | mariadb-git-a04157fbb3f2b2e054c02968ffc82bb0eb971d58.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index f4250f4c70a..c1d27cb1791 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -86,7 +86,8 @@ public: { /* never called */ } ~String() { free(); } - inline void set_charset(CHARSET_INFO *charset) { str_charset= charset; } + inline void set_charset(CHARSET_INFO *charset_arg) + { str_charset= charset_arg; } inline CHARSET_INFO *charset() const { return str_charset; } inline uint32 length() const { return str_length;} inline uint32 alloced_length() const { return Alloced_length;} |