diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-25 12:06:01 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-25 12:06:01 +0100 |
| commit | e8b8a9acb7bcec59bdc11feea8f597ee6bbb7f77 (patch) | |
| tree | aca3894e202e26cb71a5d329436ce29e1d0e2851 | |
| parent | 16252b6fee8417f97dd22e13e9dc9a72170c0ffd (diff) | |
| download | mariadb-git-e8b8a9acb7bcec59bdc11feea8f597ee6bbb7f77.tar.gz | |
After-merge fix for merge of MySQL 5.1.41 into MariaDB: Valgrind fixes.
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())
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 4 | ||||
| -rw-r--r-- | sql/log_event.cc | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 9612436009c..860894f6fb8 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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; diff --git a/sql/log_event.cc b/sql/log_event.cc index ac2b2e70f20..eddfd11e285 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -4509,6 +4509,7 @@ int Load_log_event::do_apply_event(NET* net, Relay_log_info const *rli, 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) |