From 8f9ba2eb9d6338fc21bf4b410dc6d47b3beb4a60 Mon Sep 17 00:00:00 2001
From: Bogdan Popescu <68062990+bopopescu@users.noreply.github.com>
Date: Fri, 24 Jul 2020 03:33:27 +0300
Subject: [PATCH] Changing the master/slave words

---
 .../python2/mysql/connector/constants.py                      | 2 +-
 .../python2/mysql/connector/locales/eng/client_error.py       | 4 ++--
 .../python3/mysql/connector/constants.py                      | 2 +-
 .../python3/mysql/connector/locales/eng/client_error.py       | 4 ++--
 mysql-connector-python-1.2.3/tests/mysqld.py                  | 2 +-
 mysql-connector-python-1.2.3/tests/test_fabric.py             | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mysql-connector-python-1.2.3/python2/mysql/connector/constants.py b/mysql-connector-python-1.2.3/python2/mysql/connector/constants.py
index 020d732..769d212 100644
--- a/mysql-connector-python-1.2.3/python2/mysql/connector/constants.py
+++ b/mysql-connector-python-1.2.3/python2/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/mysql-connector-python-1.2.3/python2/mysql/connector/locales/eng/client_error.py b/mysql-connector-python-1.2.3/python2/mysql/connector/locales/eng/client_error.py
index 81a3084..7c2f322 100644
--- a/mysql-connector-python-1.2.3/python2/mysql/connector/locales/eng/client_error.py
+++ b/mysql-connector-python-1.2.3/python2/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"
diff --git a/mysql-connector-python-1.2.3/python3/mysql/connector/constants.py b/mysql-connector-python-1.2.3/python3/mysql/connector/constants.py
index ed5327f..81702f7 100644
--- a/mysql-connector-python-1.2.3/python3/mysql/connector/constants.py
+++ b/mysql-connector-python-1.2.3/python3/mysql/connector/constants.py
@@ -456,7 +456,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/mysql-connector-python-1.2.3/python3/mysql/connector/locales/eng/client_error.py b/mysql-connector-python-1.2.3/python3/mysql/connector/locales/eng/client_error.py
index 561c9a2..ffb17bd 100644
--- a/mysql-connector-python-1.2.3/python3/mysql/connector/locales/eng/client_error.py
+++ b/mysql-connector-python-1.2.3/python3/mysql/connector/locales/eng/client_error.py
@@ -52,8 +52,8 @@
 CR_EMBEDDED_CONNECTION = "Embedded server"
 CR_PROBE_SLAVE_STATUS = "Error on SHOW SLAVE STATUS:"
 CR_PROBE_SLAVE_HOSTS = "Error on SHOW SLAVE HOSTS:"
-CR_PROBE_SLAVE_CONNECT = "Error connecting to slave:"
-CR_PROBE_MASTER_CONNECT = "Error connecting to master:"
+CR_PROBE_SLAVE_CONNECT = "Error connecting to subordinate:"
+CR_PROBE_MASTER_CONNECT = "Error connecting to main:"
 CR_SSL_CONNECTION_ERROR = "SSL connection error: %-.100s"
 CR_MALFORMED_PACKET = "Malformed packet"
 CR_WRONG_LICENSE = "This client library is licensed only for use with MySQL servers having '%s' license"
diff --git a/mysql-connector-python-1.2.3/tests/mysqld.py b/mysql-connector-python-1.2.3/tests/mysqld.py
index 35909d7..0f8be71 100644
--- a/mysql-connector-python-1.2.3/tests/mysqld.py
+++ b/mysql-connector-python-1.2.3/tests/mysqld.py
@@ -414,7 +414,7 @@ def bootstrap(self):
                 " `Process_priv`, `File_priv`, `Grant_priv`, `References_priv`,"
                 " `Index_priv`, `Alter_priv`, `Show_db_priv`, `Super_priv`,"
                 " `Create_tmp_table_priv`, `Lock_tables_priv`, `Execute_priv`,"
-                " `Repl_slave_priv`, `Repl_client_priv`, `Create_view_priv`,"
+                " `Repl_subordinate_priv`, `Repl_client_priv`, `Create_view_priv`,"
                 " `Show_view_priv`, `Create_routine_priv`, "
                 "`Alter_routine_priv`,"
                 " `Create_user_priv`, `Event_priv`, `Trigger_priv`, "
diff --git a/mysql-connector-python-1.2.3/tests/test_fabric.py b/mysql-connector-python-1.2.3/tests/test_fabric.py
index 3df7a65..01fdc46 100644
--- a/mysql-connector-python-1.2.3/tests/test_fabric.py
+++ b/mysql-connector-python-1.2.3/tests/test_fabric.py
@@ -598,7 +598,7 @@ def test_get_group_server(self):
         self.assertRaises(errors.InterfaceError, fab.get_group_server,
                           'emptygroup')
 
-        # Request PRIMARY (master)
+        # Request PRIMARY (main)
         exp = fab.get_group_servers('testgroup1')[1]
         self.assertEqual(
             exp,