From 57a8a19e2f831ee3a42373f33ccd2601622c9f56 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Thu, 14 Dec 2017 15:09:16 -0800
Subject: [PATCH] (MODULES-4794) Add paths for RHSC

---
 lib/puppet/provider/mysql_datadir/mysql.rb | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/puppet/provider/mysql_datadir/mysql.rb b/lib/puppet/provider/mysql_datadir/mysql.rb
index 121281d65..ec5f32b32 100644
--- a/lib/puppet/provider/mysql_datadir/mysql.rb
+++ b/lib/puppet/provider/mysql_datadir/mysql.rb
@@ -5,7 +5,26 @@
   initvars
 
   # Make sure we find mysqld on CentOS and mysql_install_db on Gentoo and Solaris 11
-  ENV['PATH'] = ENV['PATH'] + ':/usr/libexec:/usr/share/mysql/scripts:/opt/rh/mysql55/root/usr/bin:/opt/rh/mysql55/root/usr/libexec:/usr/mysql/5.5/bin:/usr/mysql/5.6/bin:/usr/mysql/5.7/bin'
+  ENV['PATH'] = [
+    ENV['PATH'],
+    '/usr/libexec',
+    '/usr/share/mysql/scripts',
+    '/opt/rh/rh-mysql57/root/usr/bin',
+    '/opt/rh/rh-mysql57/root/usr/libexec',
+    '/opt/rh/rh-mysql56/root/usr/bin',
+    '/opt/rh/rh-mysql56/root/usr/libexec',
+    '/opt/rh/rh-mariadb101/root/usr/bin',
+    '/opt/rh/rh-mariadb101/root/usr/libexec',
+    '/opt/rh/rh-mariadb100/root/usr/bin',
+    '/opt/rh/rh-mariadb100/root/usr/libexec',
+    '/opt/rh/mysql55/root/usr/bin',
+    '/opt/rh/mysql55/root/usr/libexec',
+    '/opt/rh/mariadb55/root/usr/bin',
+    '/opt/rh/mariadb55/root/usr/libexec',
+    '/usr/mysql/5.5/bin',
+    '/usr/mysql/5.6/bin',
+    '/usr/mysql/5.7/bin',
+  ].join(':')
 
   commands mysqld: 'mysqld'
   optional_commands mysql_install_db: 'mysql_install_db'