diff options
| author | monty@narttu.mysql.fi <> | 2007-01-27 03:46:45 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2007-01-27 03:46:45 +0200 |
| commit | 8a80e36ac3facdfba626fd758b6e4490d3ea9ddf (patch) | |
| tree | 7a54aa50f6bf549d049cd400fe056d244cfc7eb8 /sql/sql_string.h | |
| parent | c022454e7c5690330ed78664443e65b3511649b8 (diff) | |
| parent | 120e3f5ee1a5f2d62f6a4ff10db0797c5ac42287 (diff) | |
| download | mariadb-git-8a80e36ac3facdfba626fd758b6e4490d3ea9ddf.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
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 08c3a4cb60d..128ed749b5f 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -84,7 +84,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;} |