diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 00:51:37 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 00:51:37 +0200 |
| commit | 88dd873de0d5dc6e8f262268f925596a60b58704 (patch) | |
| tree | 142bd488523fec48817d9fb2194f1a608eec00fc /sql/sql_string.h | |
| parent | 601e6f4b2a78921304bc1d779991c615ee229f89 (diff) | |
| download | mariadb-git-88dd873de0d5dc6e8f262268f925596a60b58704.tar.gz | |
Fixed compiler warnings detected by option -Wshadow and -Wunused:
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments
Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c
I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
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 09b8478adf8..d7e9bff82e3 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;} |