Get away from master-slave jargon

Author: bopopescu

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()

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'),
     }
 
 

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"