=== modified file 'mysql-test/suite/engines/funcs/t/rpl_variables.test'
--- mysql-test/suite/engines/funcs/t/rpl_variables.test	2010-05-04 18:10:17 +0000
+++ mysql-test/suite/engines/funcs/t/rpl_variables.test	2014-11-24 12:17:23 +0000
@@ -15,6 +15,7 @@
 # We just set some arbitrary values in variables-master.opt so we can test
 # that a list of values works correctly
 show variables like 'slave_skip_errors';
+show global status like 'slave_skipped_errors';
 
 # Cleanup
 set global slave_net_timeout=@my_slave_net_timeout;

=== modified file 'sql/log_event.cc'
--- sql/log_event.cc	2014-10-09 08:30:11 +0000
+++ sql/log_event.cc	2014-11-24 12:13:09 +0000
@@ -438,8 +438,12 @@
     break;
   }
 #endif
-  return ((err_code == ER_SLAVE_IGNORED_TABLE) ||
-          (use_slave_mask && bitmap_is_set(&slave_error_mask, err_code)));
+  if (use_slave_mask && bitmap_is_set(&slave_error_mask, err_code))
+  {
+    slave_skipped_errors++;
+    return true;
+  }
+  return err_code == ER_SLAVE_IGNORED_TABLE;
 }
 
 /*

=== modified file 'sql/mysqld.cc'
--- sql/mysqld.cc	2014-11-18 21:25:47 +0000
+++ sql/mysqld.cc	2014-11-24 12:17:34 +0000
@@ -516,6 +516,7 @@
 ulong max_connections, max_connect_errors;
 ulong extra_max_connections;
 ulong slave_retried_transactions;
+ulonglong slave_skipped_errors;
 ulong feature_files_opened_with_delayed_keys;
 ulonglong denied_connections;
 my_decimal decimal_zero;
@@ -7920,6 +7921,7 @@
   {"Slave_received_heartbeats",(char*) &show_slave_received_heartbeats, SHOW_SIMPLE_FUNC},
   {"Slave_retried_transactions",(char*)&slave_retried_transactions, SHOW_LONG},
   {"Slave_running",            (char*) &show_slave_running,     SHOW_SIMPLE_FUNC},
+  {"Slave_skipped_errors",     (char*) &slave_skipped_errors, SHOW_LONGLONG},
 #endif
   {"Slow_launch_threads",      (char*) &slow_launch_threads,    SHOW_LONG},
   {"Slow_queries",             (char*) offsetof(STATUS_VAR, long_query_count), SHOW_LONG_STATUS},

=== modified file 'sql/slave.h'
--- sql/slave.h	2014-11-13 09:09:46 +0000
+++ sql/slave.h	2014-11-24 11:52:10 +0000
@@ -130,6 +130,7 @@
 extern char *opt_slave_skip_errors;
 extern my_bool opt_replicate_annotate_row_events;
 extern ulonglong relay_log_space_limit;
+extern ulonglong slave_skipped_errors;
 
 /*
   3 possible values for Master_info::slave_running and