From 035f97d69edc5c2092c6097bd31ee8ffd3953e0f Mon Sep 17 00:00:00 2001
From: Bogdan Popescu <68062990+bopopescu@users.noreply.github.com>
Date: Fri, 24 Jul 2020 03:27:48 +0300
Subject: [PATCH] Migrating from master/slave vocabulary

---
 Contents/Libraries/Shared/mysql/connector/constants.py        | 2 +-
 .../Shared/mysql/connector/locales/eng/client_error.py        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Contents/Libraries/Shared/mysql/connector/constants.py b/Contents/Libraries/Shared/mysql/connector/constants.py
index 020d732..769d212 100644
--- a/Contents/Libraries/Shared/mysql/connector/constants.py
+++ b/Contents/Libraries/Shared/mysql/connector/constants.py
@@ -457,7 +457,7 @@ class RefreshOption(_Constants):
         'HOSTS': (1 << 3, 'Flush host cache'),
         'STATUS': (1 << 4, 'Flush status variables'),
         'THREADS': (1 << 5, 'Flush thread cache'),
-        'SLAVE': (1 << 6, 'Reset master info and restart slave thread'),
+        'SLAVE': (1 << 6, 'Reset main info and restart subordinate thread'),
     }
 
 
diff --git a/Contents/Libraries/Shared/mysql/connector/locales/eng/client_error.py b/Contents/Libraries/Shared/mysql/connector/locales/eng/client_error.py
index 81a3084..7c2f322 100644
--- a/Contents/Libraries/Shared/mysql/connector/locales/eng/client_error.py
+++ b/Contents/Libraries/Shared/mysql/connector/locales/eng/client_error.py
@@ -52,8 +52,8 @@
 CR_EMBEDDED_CONNECTION = u"Embedded server"
 CR_PROBE_SLAVE_STATUS = u"Error on SHOW SLAVE STATUS:"
 CR_PROBE_SLAVE_HOSTS = u"Error on SHOW SLAVE HOSTS:"
-CR_PROBE_SLAVE_CONNECT = u"Error connecting to slave:"
-CR_PROBE_MASTER_CONNECT = u"Error connecting to master:"
+CR_PROBE_SLAVE_CONNECT = u"Error connecting to subordinate:"
+CR_PROBE_MASTER_CONNECT = u"Error connecting to main:"
 CR_SSL_CONNECTION_ERROR = u"SSL connection error: %-.100s"
 CR_MALFORMED_PACKET = u"Malformed packet"
 CR_WRONG_LICENSE = u"This client library is licensed only for use with MySQL servers having '%s' license"