← Back to team overview

maria-developers team mailing list archive

Re: [Branch ~maria-captains/maria/5.1] Rev 3120: Added suppressions

 

Hi, Monty!

Can you please explain how it is possible to have "different number rows
in the log" ?

On Dec 03, noreply@xxxxxxxxxxxxx wrote:
> ------------------------------------------------------------
> revno: 3120
> committer: Michael Widenius <monty@xxxxxxxxxxxx>
> branch nick: maria-5.1
> timestamp: Sat 2011-12-03 20:29:15 +0200
> message:
>   Added suppressions
>   Fixed feedback_plugin_send to not generate a random number of lines.
> modified:
>   mysql-test/t/feedback_plugin_send.test
>   mysql-test/valgrind.supp
>   support-files/compiler_warnings.supp
> 
> === modified file 'mysql-test/t/feedback_plugin_send.test'
> --- mysql-test/t/feedback_plugin_send.test	2011-11-13 12:28:35 +0000
> +++ mysql-test/t/feedback_plugin_send.test	2011-12-03 18:29:15 +0000
> @@ -17,7 +17,16 @@
>  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
> -
> 
Regards,
Sergei