From 8a9b09d4abd9e90c3c19f32ad11e2b676c878097 Mon Sep 17 00:00:00 2001
From: Bogdan Popescu <68062990+bopopescu@users.noreply.github.com>
Date: Thu, 23 Jul 2020 14:29:47 +0300
Subject: [PATCH] Migrate from master/slave terminology

---
 lib/mysql/connector/constants.py                | 2 +-
 lib/mysql/connector/locales/eng/client_error.py | 4 ++--
 tests/mysqld.py                                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/mysql/connector/constants.py b/lib/mysql/connector/constants.py
index 79dc178..68ce3c7 100644
--- a/lib/mysql/connector/constants.py
+++ b/lib/mysql/connector/constants.py
@@ -500,7 +500,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/lib/mysql/connector/locales/eng/client_error.py b/lib/mysql/connector/locales/eng/client_error.py
index de5ed30..98d0196 100644
--- a/lib/mysql/connector/locales/eng/client_error.py
+++ b/lib/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/tests/mysqld.py b/tests/mysqld.py
index 6d6463d..6a6b8d9 100644
--- a/tests/mysqld.py
+++ b/tests/mysqld.py
@@ -470,7 +470,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`, "