diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-12-19 21:58:05 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-12-19 21:58:05 +0200 |
| commit | 35b60208359a8c67fa773e733927d16046b416c9 (patch) | |
| tree | c81375280357b4173e36c916ccd35011377b3ab7 | |
| parent | fef08da3e742fb54d1b827f117d4bbe9aa554b5f (diff) | |
| download | mariadb-git-35b60208359a8c67fa773e733927d16046b416c9.tar.gz | |
Fixed some compiler warnings
client/mysqldump.c:
Removed compiler warning
extra/yassl/taocrypt/include/pwdbased.hpp:
Removed compiler warning (iterations is always unsigned)
support-files/compiler_warnings.supp:
Ignore warnings from groff
| -rw-r--r-- | client/mysqldump.c | 4 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/include/pwdbased.hpp | 3 | ||||
| -rw-r--r-- | support-files/compiler_warnings.supp | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 284ea1e760a..46d152f7ed1 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1914,7 +1914,9 @@ static void print_xml_row(FILE *xml_file, const char *row_name, const char *str_create) { uint i; +#ifndef DBUG_OFF my_bool body_found= 0; +#endif char *create_stmt_ptr= NULL; ulong create_stmt_len= 0; MYSQL_FIELD *field; @@ -1932,7 +1934,9 @@ static void print_xml_row(FILE *xml_file, const char *row_name, { create_stmt_ptr= (*row)[i]; create_stmt_len= lengths[i]; +#ifndef DBUG_OFF body_found= 1; +#endif } else { diff --git a/extra/yassl/taocrypt/include/pwdbased.hpp b/extra/yassl/taocrypt/include/pwdbased.hpp index d050fd8988b..58bd5902a58 100644 --- a/extra/yassl/taocrypt/include/pwdbased.hpp +++ b/extra/yassl/taocrypt/include/pwdbased.hpp @@ -51,9 +51,6 @@ word32 PBKDF2_HMAC<T>::DeriveKey(byte* derived, word32 dLen, const byte* pwd, if (dLen > MaxDerivedKeyLength()) return 0; - if (iterations < 0) - return 0; - ByteBlock buffer(T::DIGEST_SIZE); HMAC<T> hmac; diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index dbad22a0a55..a4640f843a1 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -157,6 +157,7 @@ mySTL/algorithm\.hpp: is used uninitialized in this function # Groff warnings on OpenSUSE. # .*/dbug/.*(groff|<standard input>) : .* +.*groff.* : vertical spacing must be greater than # # Warnings on OpenSolaris |