From bb9fdd6eacca553e185caafb787a2634cf5241ed Mon Sep 17 00:00:00 2001
From: Ben Thompson <ben.thompson@mariadb.com>
Date: Fri, 20 Jan 2017 17:05:50 -0600
Subject: [PATCH] MCOL-468: remove slave-skip-errors=all from default settings

---
 dbcon/mysql/my.cnf         | 1 -
 procmon/processmonitor.cpp | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/dbcon/mysql/my.cnf b/dbcon/mysql/my.cnf
index 3793e8baa..9d9907daa 100644
--- a/dbcon/mysql/my.cnf
+++ b/dbcon/mysql/my.cnf
@@ -84,7 +84,6 @@ plugin_dir                      = /usr/local/mariadb/columnstore/mysql/lib/plugi
 # defaults to 1 if master-host
 # uses to 2+ if slave-host
 server-id = 1
-slave-skip-errors=all
 
 # Replication Slave (comment out master section to use this)
 #
diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp
index 56fa5ac33..0849a6246 100644
--- a/procmon/processmonitor.cpp
+++ b/procmon/processmonitor.cpp
@@ -4835,11 +4835,6 @@ int ProcessMonitor::changeMyCnf(std::string type)
 				}
 			}
 
-			pos = buf.find("slave-skip-errors=all",0);
-			if ( pos != string::npos ) {
-				buf = "# slave-skip-errors=all";
-			}
-
 			//output to temp file
 			lines.push_back(buf);
 		}