← Back to team overview

maria-developers team mailing list archive

bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (monty:2764)

 

#At lp:maria/5.2 based on revid:monty@xxxxxxxxxxxx-20100401090935-b2yfd23r67e7sl42

 2764 Michael Widenius	2010-04-01 [merge]
      Auto merge with 5.1
      modified:
        support-files/compiler_warnings.supp

=== modified file 'support-files/compiler_warnings.supp'
--- a/support-files/compiler_warnings.supp	2010-03-31 19:12:21 +0000
+++ b/support-files/compiler_warnings.supp	2010-04-01 09:08:42 +0000
@@ -160,4 +160,4 @@ ctype-simple\.c : .*unary minus operator
 # Wrong warning due to GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478
 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/dict/dict0dict\.c : passing argument 1 of .*strcpy.* discards qualifiers from pointer target type : 2500-3500