*** sql/rpl_slave.h.orig        2016-08-25 20:52:06.000000000 +0900
--- sql/rpl_slave.h     2016-09-28 11:53:54.950570024 +0900
***************
*** 63,69 ****

  #define SLAVE_NET_TIMEOUT  60

! #define MAX_SLAVE_ERROR    2000

  #define MTS_WORKER_UNDEF ((ulong) -1)
  #define MTS_MAX_WORKERS  1024
--- 63,71 ----

  #define SLAVE_NET_TIMEOUT  60

! #define MAX_SLAVE_ERROR    4000
! #define MIN_CLIENT_ERROR   2000
! #define MAX_CLIENT_ERROR   2999

  #define MTS_WORKER_UNDEF ((ulong) -1)
  #define MTS_MAX_WORKERS  1024
*** sql/rpl_slave.cc.orig       2016-08-25 20:52:06.000000000 +0900
--- sql/rpl_slave.cc    2016-09-28 11:57:42.854525790 +0900
***************
*** 1480,1486 ****
      }
      if (buff != slave_skip_error_names)
        buff--; // Remove last ','
!     if (errnum < MAX_SLAVE_ERROR)
      {
        /* Couldn't show all errors */
        buff= my_stpcpy(buff, "..."); /* purecov: tested */
--- 1480,1486 ----
      }
      if (buff != slave_skip_error_names)
        buff--; // Remove last ','
!     if (errnum < MAX_SLAVE_ERROR && (errnum < MIN_CLIENT_ERROR || errnum > MAX_CLIENT_ERROR))
      {
        /* Couldn't show all errors */
        buff= my_stpcpy(buff, "..."); /* purecov: tested */
***************
*** 1530,1536 ****
    for (uint i = 0; i < n_errors; i++)
    {
      const uint err_code = errors[i];
!     if (err_code < MAX_SLAVE_ERROR)
         bitmap_set_bit(&slave_error_mask, err_code);
    }
    DBUG_VOID_RETURN;
--- 1530,1536 ----
    for (uint i = 0; i < n_errors; i++)
    {
      const uint err_code = errors[i];
!     if (err_code < MAX_SLAVE_ERROR && (err_code > MAX_CLIENT_ERROR || err_code < MIN_CLIENT_ERROR))
         bitmap_set_bit(&slave_error_mask, err_code);
    }
    DBUG_VOID_RETURN;