*** sql/log_event.cc.orig       2016-09-28 12:40:19.220471725 +0900
--- sql/log_event.cc    2016-09-28 12:39:44.781331131 +0900
***************
*** 4683,4695 ****
          !ignored_error_code(actual_error) &&
          !ignored_error_code(expected_error))
      {
!       rli->report(ERROR_LEVEL, ER_INCONSISTENT_ERROR, ER(ER_INCONSISTENT_ERROR),
!                   ER_THD(thd, expected_error), expected_error,
!                   (actual_error ?
!                    thd->get_stmt_da()->message_text() :
!                    "no error"),
!                   actual_error, print_slave_db_safe(db), query_arg);
!       thd->is_slave_error= 1;
      }
      /*
        If we get the same error code as expected and it is not a concurrency
--- 4683,4698 ----
          !ignored_error_code(actual_error) &&
          !ignored_error_code(expected_error))
      {
!       if (!ignored_error_code(ER_INCONSISTENT_ERROR))
!       {
!         rli->report(ERROR_LEVEL, ER_INCONSISTENT_ERROR, ER(ER_INCONSISTENT_ERROR),
!                     ER_THD(thd, expected_error), expected_error,
!                     (actual_error ?
!                      thd->get_stmt_da()->message_text() :
!                      "no error"),
!                     actual_error, print_slave_db_safe(db), query_arg);
!         thd->is_slave_error= 1;
!       }
      }
      /*
        If we get the same error code as expected and it is not a concurrency