summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-11-29 22:48:24 +0200
committerMichael Widenius <monty@askmonty.org>2011-11-29 22:48:24 +0200
commita7f87effa57f6486c23bf5b340c8474a635dcf71 (patch)
tree5f72d973eaaa8a62d871a25640a2618d7284537d /support-files
parent389acf0a30415c745d2c241e1584b0b637ab95ed (diff)
parenta19f4e3a3af4c18ec89f8f8a4ae32e3c7d7fec70 (diff)
downloadmariadb-git-a7f87effa57f6486c23bf5b340c8474a635dcf71.tar.gz
Merge with 5.1 + fixes for build failures in 5.2
cmd-line-utils/libedit/map.c: Fixed compiler warning cmd-line-utils/libedit/terminal.c: Fixed compiler warning cmd-line-utils/libedit/tty.c: Fixed compiler warning sql/sql_base.cc: Fixed memory leak found by valgrind storage/maria/compat_aliases.cc: Ensure that recover_alias is also a set storage/maria/ma_bitmap.c: Proper fix for compiler warning support-files/compiler_warnings.supp: Fixed compiler warning
Diffstat (limited to 'support-files')
-rw-r--r--support-files/compiler_warnings.supp1
1 files changed, 1 insertions, 0 deletions
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index 0a0f08eac16..ec6b742542a 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -183,6 +183,7 @@ ctype-simple\.c : .*unary minus operator applied to unsigned type, result still
regexec\.c : passing argument 3 of.*matcher.* discards qualifiers from pointer target type
libmysql\.c: passing argument 2 of .*memcpy.* discards qualifiers from pointer target type : 3000-4000
storage/xtradb/dict/dict0dict\.c : passing argument 1 of .*strcpy.* discards qualifiers from pointer target type : 2500-3500
+storage/xtradb/sync/sync0rw\.c : passing argument 1 of .*memset.* discards qualifiers from pointer target type : 200-300
#
# Strange things from autoconf that is probably safe to ignore