From 59f5c05a387de0d3dadc85f8e2dfc68f24a255f5 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Tue, 24 Jan 2012 18:07:35 +0200 Subject: Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO"; Don't log updates to performance schema in replication log. Ensure that we don't call ha_update after ha_index_or_rnd_end() is called on slave. .bzrignore: Ignore some generated files mysql-test/include/show_slave_status.inc: Ensure that ./ is removed from file names mysql-test/suite/perfschema/r/binlog_mix.result: Updated results mysql-test/suite/perfschema/r/binlog_row.result: Updated results mysql-test/suite/perfschema/r/binlog_stmt.result: Updated results mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result: Updated results mysql-test/suite/rpl/r/rpl_performance_schema.result: Ensure that we don't crash slave when we update performance schema mysql-test/suite/rpl/t/rpl_performance_schema.test: Ensure that we don't crash slave when we update performance schema sql/log_event.cc: Ensure that we don't call ha_update after ha_index_or_rnd_end() is called. Remove old code that is not needed anymore (like restarting read loop over all rows if no matcing row is found) Simplify code sql/log_event_old.cc: Ensure that we don't call ha_update after ha_index_or_rnd_end() is called. storage/myisam/ha_myisam.cc: More DBUG_PRINT storage/perfschema/ha_perfschema.h: Don't log updates to performance schema in replication log. --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index b34267b09f4..d3aba366fbe 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1135,3 +1135,5 @@ plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL libmysqld/libmysqld_exports_file.cc libmysqld/gcalc_slicescan.cc libmysqld/gcalc_tools.cc +sql/share/errmsg.sys +sql/share/mysql -- cgit v1.2.1