maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2771 knielsen@xxxxxxxxxxxxxxx	2009-11-25
      After-merge fix for merge of MySQL 5.1.41 into MariaDB: Valgrind fixes.
      modified:
        mysql-test/mysql-test-run.pl
        sql/log_event.cc

per-file messages:
  mysql-test/mysql-test-run.pl
    Fix Valgrind warnings: add more post-shutdown warning suppressions, and revert
    bad previous change.
  sql/log_event.cc
    Manually apply fix for Bug#48340 (basically missing initialisation
    of thd->lex->local_file in Load_log_event::do_apply_event())
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-11-24 09:34:42 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-11-25 11:06:01 +0000
@@ -223,7 +223,7 @@ my $opt_strace_client;
 our $opt_user = "root";
 
 my $opt_valgrind= 0;
-my $opt_valgrind_mysqld= 0;
+our $opt_valgrind_mysqld= 0;
 my $opt_valgrind_mysqltest= 0;
 my @default_valgrind_args= ("--show-reachable=yes");
 my @valgrind_args;
@@ -3990,6 +3990,8 @@ sub extract_warning_lines ($) {
      qr/unknown variable 'loose-/,
      qr/Now setting lower_case_table_names to [02]/,
      qr/deprecated/,
+     qr/Slave SQL thread retried transaction/,
+     qw/Slave \(additional info\)/,
     );
 
   my $match_count= 0;

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2009-11-16 20:49:51 +0000
+++ b/sql/log_event.cc	2009-11-25 11:06:01 +0000
@@ -4509,6 +4509,7 @@ int Load_log_event::do_apply_event(NET* 
     as the present method does not call mysql_parse().
   */
   lex_start(thd);
+  thd->lex->local_file= local_fname;
   mysql_reset_thd_for_next_command(thd);
 
   if (!use_rli_only_for_errors)