[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2771)

#At lp:maria 2771 knielsen@knielsen-hq.org 2009-11-25 After-merge fix for merge of MySQL 5.1.41 into MariaDB. Manually apply fix for Bug#48340 (basically missing initialisation of thd->lex->local_file in Load_log_event::do_apply_event()) modified: sql/log_event.cc === 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 09:15:05 +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)