database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

After-merge fix for merge of MySQL 5.1.41 into MariaDB: Valgrind fixes.

Browse Source 
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())
This commit is contained in:
unknown
2009-11-25 12:06:01 +01:00
parent 0a65668080
commit 3cc208730a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.pl
View File

@ -223,7 +223,7 @@ my $opt_strace_client;
our $opt_user = "root"; our $opt_user = "root";
my $opt_valgrind= 0; my $opt_valgrind= 0;
my $opt_valgrind_mysqld= 0; our $opt_valgrind_mysqld= 0;
my $opt_valgrind_mysqltest= 0; my $opt_valgrind_mysqltest= 0;
my @default_valgrind_args= ("--show-reachable=yes"); my @default_valgrind_args= ("--show-reachable=yes");
my @valgrind_args; my @valgrind_args;
@ -3990,6 +3990,8 @@ sub extract_warning_lines ($) {
qr/unknown variable 'loose-/, qr/unknown variable 'loose-/,
qr/Now setting lower_case_table_names to [02]/, qr/Now setting lower_case_table_names to [02]/,
qr/deprecated/, qr/deprecated/,
qr/Slave SQL thread retried transaction/,
qw/Slave \(additional info\)/,
); );
my $match_count= 0; my $match_count= 0;

1
sql/log_event.cc
View File

@ -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(). as the present method does not call mysql_parse().
*/ */
lex_start(thd); lex_start(thd);
thd->lex->local_file= local_fname;
mysql_reset_thd_for_next_command(thd); mysql_reset_thd_for_next_command(thd);
if (!use_rli_only_for_errors) if (!use_rli_only_for_errors)