← Back to team overview

maria-developers team mailing list archive

[Branch ~maria-captains/maria/5.1] Rev 2826: Fixes for two test failures in Buildbot.

 

------------------------------------------------------------
revno: 2826
committer: knielsen@xxxxxxxxxxxxxxx
branch nick: mariadb-5.1
timestamp: Wed 2010-03-10 10:11:02 +0100
message:
  Fixes for two test failures in Buildbot.
  
   - Adjust timing in test case, to avoid test failures caused by high load
     on machines and consequent race conditions in the test case.
  
   - Add another variant of Valgrind suppressions for memory leak in system
     libraries when unloading dynamic object files.
modified:
  mysql-test/r/information_schema.result
  mysql-test/t/information_schema.test
  mysql-test/valgrind.supp


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.
=== modified file 'mysql-test/r/information_schema.result'
--- mysql-test/r/information_schema.result	2010-01-15 15:58:25 +0000
+++ mysql-test/r/information_schema.result	2010-03-10 09:11:02 +0000
@@ -1386,7 +1386,7 @@
 other connection here
 SELECT IF(`time` > 0, 'OK', `time`) AS time_low,
 IF(`time` < 1000, 'OK', `time`) AS time_high,
-IF(time_ms > 1500, 'OK', time_ms) AS time_ms_low,
+IF(time_ms >= 1000, 'OK', time_ms) AS time_ms_low,
 IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high
 FROM INFORMATION_SCHEMA.PROCESSLIST
 WHERE ID=@tid;

=== modified file 'mysql-test/t/information_schema.test'
--- mysql-test/t/information_schema.test	2009-11-30 13:36:06 +0000
+++ mysql-test/t/information_schema.test	2010-03-10 09:11:02 +0000
@@ -1114,7 +1114,7 @@
 --enable_query_log
 SELECT IF(`time` > 0, 'OK', `time`) AS time_low,
        IF(`time` < 1000, 'OK', `time`) AS time_high,
-       IF(time_ms > 1500, 'OK', time_ms) AS time_ms_low,
+       IF(time_ms >= 1000, 'OK', time_ms) AS time_ms_low,
        IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high
   FROM INFORMATION_SCHEMA.PROCESSLIST
  WHERE ID=@tid;

=== modified file 'mysql-test/valgrind.supp'
--- mysql-test/valgrind.supp	2010-01-18 12:56:10 +0000
+++ mysql-test/valgrind.supp	2010-03-10 09:11:02 +0000
@@ -469,6 +469,26 @@
 }
 
 {
+   dlclose memory loss from plugin variant 8
+   Memcheck:Leak
+   fun:calloc
+   fun:_dlerror_run
+   fun:dlclose
+   fun:_Z15free_plugin_memP12st_plugin_dl
+   fun:_Z13plugin_dl_delPK19st_mysql_lex_string
+}
+
+{
+   dlclose memory loss from plugin variant 9
+   Memcheck:Leak
+   fun:calloc
+   fun:_dlerror_run
+   fun:dlclose
+   fun:_ZL15free_plugin_memP12st_plugin_dl
+   fun:_ZL13plugin_dl_delPK19st_mysql_lex_string
+}
+
+{
    dlopen / ptread_cancel_init memory loss on Suse Linux 10.3 32/64 bit ver 1
    Memcheck:Leak
    fun:*alloc