From 82f12516e0380f0f8fda3e82c18c19996fde0a29 Mon Sep 17 00:00:00 2001
From: Bogdan Popescu <68062990+bopopescu@users.noreply.github.com>
Date: Fri, 24 Jul 2020 08:59:42 +0300
Subject: [PATCH] Get away from master-slave jargon

---
 convert_sqlite_to_mysql_script/convert_sqlite_to_mysql_rb.py  | 4 ++--
 convert_sqlite_to_mysql_script/mysql/connector/constants.py   | 2 +-
 .../mysql/connector/locales/eng/client_error.py               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/convert_sqlite_to_mysql_script/convert_sqlite_to_mysql_rb.py b/convert_sqlite_to_mysql_script/convert_sqlite_to_mysql_rb.py
index f6ae8be1..6d90aed7 100644
--- a/convert_sqlite_to_mysql_script/convert_sqlite_to_mysql_rb.py
+++ b/convert_sqlite_to_mysql_script/convert_sqlite_to_mysql_rb.py
@@ -254,8 +254,8 @@ def isSqliteType(dbLocationArg):
         tmpCursor = tmpConnection.cursor()
             
         try:
-            # try getting something from the master table
-            tmpCursor.execute('''select * from sqlite_master limit 1''')
+            # try getting something from the main table
+            tmpCursor.execute('''select * from sqlite_main limit 1''')
         except sqlite3.DatabaseError as e:
             tmpCursor.close()
             tmpConnection.close()
diff --git a/convert_sqlite_to_mysql_script/mysql/connector/constants.py b/convert_sqlite_to_mysql_script/mysql/connector/constants.py
index e381721b..3d737e5c 100644
--- a/convert_sqlite_to_mysql_script/mysql/connector/constants.py
+++ b/convert_sqlite_to_mysql_script/mysql/connector/constants.py
@@ -411,7 +411,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/convert_sqlite_to_mysql_script/mysql/connector/locales/eng/client_error.py b/convert_sqlite_to_mysql_script/mysql/connector/locales/eng/client_error.py
index 89de8eaa..31284d24 100644
--- a/convert_sqlite_to_mysql_script/mysql/connector/locales/eng/client_error.py
+++ b/convert_sqlite_to_mysql_script/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"