diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 01:01:52 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 01:01:52 +0200 |
| commit | a6481aa4c7016c996a9787db4824307c705ec8a1 (patch) | |
| tree | b60f635d3126e8d0f1321f0187390d7cf8496558 /sql/sql_string.h | |
| parent | 95564bfea31aef4686ae4e7c6d422e2a20a5d73a (diff) | |
| parent | 88dd873de0d5dc6e8f262268f925596a60b58704 (diff) | |
| download | mariadb-git-a6481aa4c7016c996a9787db4824307c705ec8a1.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 2be2cca5427..8d38338ab68 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -87,7 +87,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;} |