MDEV-13577 slave_parallel_mode=optimistic should not report the mode's specific temporary errors

Revert 7bbe324fc17
Fix the bug differently (in log_event.cc)
Fix the test case to actually fail without the bug fix

1 files changed, 0 insertions, 10 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 5bf5e3f73fc..5f954f7576d 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3517,16 +3517,6 @@ void my_message_sql(uint error, const char *str, myf MyFlags)
     level= Sql_condition::WARN_LEVEL_WARN;
     func= sql_print_warning;
   }
-  else if (MyFlags & ME_LOG_AS_WARN)
-  {
-    /*
-      Typical use case is optimistic parallel slave where DA needs to hold
-      an error condition caused by the current error, but the error-log
-      level is relaxed to the warning one.
-    */
-    level= Sql_condition::WARN_LEVEL_ERROR;
-    func= sql_print_warning;
-  }
   else
   {
     level= Sql_condition::WARN_LEVEL_ERROR;