[Commits] 1f8efee: Merge MDEV-7198: status variable for Slave_skipped_errors

Kristian Nielsen knielsen at knielsen-hq.org
Mon Mar 16 15:58:02 EET 2015


revision-id: 1f8efee58467d05c76ac366226634d181cc72153
parent(s): ef4d8db5ece5edfe3574561a8cec70863d390c91 9362dd43ff6f08d3cde4f62c11aa0588ed84eee1
committer: Kristian Nielsen
branch nick: server
timestamp: 2015-03-16 14:54:16 +0100
message:

Merge MDEV-7198: status variable for Slave_skipped_errors


 mysql-test/suite/rpl/r/rpl_skip_error.result |    6 ++++++
 mysql-test/suite/rpl/t/rpl_skip_error.test   |    2 ++
 sql/log_event.cc                             |    8 ++++++--
 sql/mysqld.cc                                |    2 ++
 sql/slave.h                                  |    1 +
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --cc sql/log_event.cc
index ad9d8f3,d128a5b..650610f
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@@ -428,8 -426,26 +428,12 @@@ inline int idempotent_error_code(int er
  
  inline int ignored_error_code(int err_code)
  {
-   return ((err_code == ER_SLAVE_IGNORED_TABLE) ||
-           (use_slave_mask && bitmap_is_set(&slave_error_mask, err_code)));
 -#ifdef HAVE_NDB_BINLOG
 -  /*
 -    The following error codes are hard-coded and will always be ignored.
 -  */
 -  switch (err_code)
 -  {
 -  case ER_DB_CREATE_EXISTS:
 -  case ER_DB_DROP_EXISTS:
 -    return 1;
 -  default:
 -    /* Nothing to do */
 -    break;
 -  }
 -#endif
+   if (use_slave_mask && bitmap_is_set(&slave_error_mask, err_code))
+   {
+     statistic_increment(slave_skipped_errors, LOCK_status);
 -    return true;
++    return 1;
+   }
+   return err_code == ER_SLAVE_IGNORED_TABLE;
  }
  
  /*


More information about the commits mailing list