diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-03 20:29:15 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-03 20:29:15 +0200 |
| commit | 2e34f1828ec6b1bf897eaa23dec8fce544047278 (patch) | |
| tree | 18cbb0becbc43f1c83c54ad8bf7f1eadb1bdaf26 | |
| parent | 926dc1e65cffe9b13e83f6138be4620f0d551081 (diff) | |
| download | mariadb-git-2e34f1828ec6b1bf897eaa23dec8fce544047278.tar.gz | |
Added suppressions
Fixed feedback_plugin_send to not generate a random number of lines.
mysql-test/t/feedback_plugin_send.test:
Don't print more than 4 lines (sometimes there are 6 feedback lines in the log...)
mysql-test/valgrind.supp:
Added suppression for failure on work
support-files/compiler_warnings.supp:
Suppress warning from xtradb
| -rw-r--r-- | mysql-test/t/feedback_plugin_send.test | 13 | ||||
| -rw-r--r-- | mysql-test/valgrind.supp | 10 | ||||
| -rw-r--r-- | support-files/compiler_warnings.supp | 1 |
3 files changed, 22 insertions, 2 deletions
diff --git a/mysql-test/t/feedback_plugin_send.test b/mysql-test/t/feedback_plugin_send.test index 14765ee9543..d882539cfea 100644 --- a/mysql-test/t/feedback_plugin_send.test +++ b/mysql-test/t/feedback_plugin_send.test @@ -17,7 +17,16 @@ replace_result https http; perl; $log_error= $ENV{'MYSQLTEST_VARDIR'} . '/log/mysqld.1.err'; open(LOG, '<', $log_error) or die "open(< $log_error): $!"; - /feedback plugin:.*/ && print "$&\n" while $_=<LOG>; + + # Get the first few rows (as there may be different number rows in the log) + $i= 0; + while ($_=<LOG>) + { + if (/feedback plugin:.*/) + { + print "$&\n"; + break if ($i++ >= 3); + } + } close LOG; EOF - diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp index f48fe1b9967..ff649db144a 100644 --- a/mysql-test/valgrind.supp +++ b/mysql-test/valgrind.supp @@ -1118,3 +1118,13 @@ fun:fil_delete_tablespace fun:row_drop_table_for_mysql } + +{ + Problem with udf and libresolve + Memcheck:Cond + obj:*/libresolv*.so + fun:__libc_res_nquery + fun:_nss_dns_gethostbyaddr2_r + fun:_nss_dns_gethostbyaddr_r + fun:gethostbyaddr_r +} diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index a56c39b51a0..b131f2cc1b2 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -183,3 +183,4 @@ 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 |