Merge pull request #50698 from ajlam/master

GitHubber17 · web-flow · commit a007b32765a1 · 2018-09-04T09:45:56.000-07:00
Address MicrosoftDocs/azure-docs#14184 and MicrosoftDocs/azure-docs#14181
diff --git a/articles/mysql/concepts-data-in-replication.md b/articles/mysql/concepts-data-in-replication.md
@@ -8,7 +8,7 @@ manager: kfile
 editor: jasonwhowell
 ms.service: mysql
 ms.topic: article
-ms.date: 06/20/2018
+ms.date: 08/31/2018
 ---
 
 # Replicate data into Azure Database for MySQL
@@ -24,16 +24,17 @@ The main scenarios to consider using Data-in Replication are:
 ## Limitations and considerations
 
 ### Data not replicated
-The [*mysql system database*](https://dev.mysql.com/doc/refman/5.7/en/system-database.html) on the primary server is not replicated. Changes to accounts and permissions on the primary server are not replicated. If you create an account on the primary server and this account needs to access the replica server, then manually create the same account on the replica server side. To understand what tables are contained in the system database, see the [MySQL manual](https://dev.mysql.com/doc/refman/5.7/en/system-database.html).
+The [*mysql system database*](https://dev.mysql.com/doc/refman/5.7/en/system-database.html) on the master server is not replicated. Changes to accounts and permissions on the master server are not replicated. If you create an account on the master server and this account needs to access the replica server, then manually create the same account on the replica server side. To understand what tables are contained in the system database, see the [MySQL manual](https://dev.mysql.com/doc/refman/5.7/en/system-database.html).
 
 ### Requirements
-- The primary server version must be at least MySQL version 5.6. 
-- The primary and replica server versions must be the same. For example, both must be MySQL version 5.6 or both must be MySQL version 5.7.
+- The master server version must be at least MySQL version 5.6. 
+- The master and replica server versions must be the same. For example, both must be MySQL version 5.6 or both must be MySQL version 5.7.
 - Each table must have a primary key.
-- Primary server should use the MySQL InnoDB engine.
-- User must have permissions to configure binary logging and create new users on the primary server.
+- Master server should use the MySQL InnoDB engine.
+- User must have permissions to configure binary logging and create new users on the master server.
 
 ### Other
+- Data-in replication is only supported in General Purpose and Memory Optimized pricing tiers
 - Global transaction identifiers (GTID) are not supported.
 
 ## Next steps
diff --git a/articles/mysql/howto-data-in-replication.md b/articles/mysql/howto-data-in-replication.md
@@ -8,12 +8,12 @@ manager: kfile
 editor: jasonwhowell
 ms.service: mysql
 ms.topic: article
-ms.date: 06/20/2018
+ms.date: 08/31/2018
 ---
 
 # How to configure Azure Database for MySQL Data-in Replication
 
-In this article, you will learn how to set up Data-in Replication in the Azure Database for MySQL service by configuring the primary and replica servers. Data-in Replication allows you to synchronize data from a primary MySQL server running on-premises, in virtual machines, or database services hosted by other cloud providers into a replica in the Azure Database for MySQL service. 
+In this article, you will learn how to set up Data-in Replication in the Azure Database for MySQL service by configuring the master and replica servers. Data-in Replication allows you to synchronize data from a master MySQL server running on-premises, in virtual machines, or database services hosted by other cloud providers into a replica in the Azure Database for MySQL service. 
 
 This article assumes that you have at least some prior experience with MySQL servers and databases.
 
@@ -29,14 +29,14 @@ This article assumes that you have at least some prior experience with MySQL ser
 
 2. Create same user accounts and corresponding privileges
 
-   User accounts are not replicated from the primary server to the replica server. If you plan on providing users with access to the replica server, you need to manually create all accounts and corresponding privileges on this newly created Azure Database for MySQL server.
+   User accounts are not replicated from the master server to the replica server. If you plan on providing users with access to the replica server, you need to manually create all accounts and corresponding privileges on this newly created Azure Database for MySQL server.
 
-## Configure the primary server
-The following steps prepare and configure the MySQL server hosted on-premises, in a virtual machine, or database service hosted by other cloud providers for Data-in Replication. This server is the "primary" in Data-in replication. 
+## Configure the master server
+The following steps prepare and configure the MySQL server hosted on-premises, in a virtual machine, or database service hosted by other cloud providers for Data-in Replication. This server is the "master" in Data-in replication. 
 
 1. Turn on binary logging
 
-   Check to see if binary logging has been enabled on the primary by running the following command: 
+   Check to see if binary logging has been enabled on the master by running the following command: 
 
    ```sql
    SHOW VARIABLES LIKE 'log_bin';
@@ -46,19 +46,19 @@ The following steps prepare and configure the MySQL server hosted on-premises, i
 
    If `log_bin` is returned with the value “OFF”, turn on binary logging by editing your my.cnf file so that `log_bin=ON` and restart your server for the change to take effect.
 
-2. Primary server settings
+2. Master server settings
 
-   Data-in Replication requires parameter `lower_case_table_names` to be consistent between the primary and replica servers. This parameter is 1 by default in Azure Database for MySQL. 
+   Data-in Replication requires parameter `lower_case_table_names` to be consistent between the master and replica servers. This parameter is 1 by default in Azure Database for MySQL. 
 
    ```sql
    SET GLOBAL lower_case_table_names = 1;
    ```
 
 3. Create a new replication role and set up permission
 
-   Create a user account on the primary server that is configured with replication privileges. This can be done through SQL commands or a tool like MySQL Workbench. Consider whether you plan on replicating with SSL as this will need to be specified when creating the user. Refer to the MySQL documentation to understand how to [add user accounts](https://dev.mysql.com/doc/refman/5.7/en/adding-users.html) on your primary server. 
+   Create a user account on the master server that is configured with replication privileges. This can be done through SQL commands or a tool like MySQL Workbench. Consider whether you plan on replicating with SSL as this will need to be specified when creating the user. Refer to the MySQL documentation to understand how to [add user accounts](https://dev.mysql.com/doc/refman/5.7/en/adding-users.html) on your master server. 
 
-   In the commands below, the new replication role created is able to access the primary from any machine, not just the machine that hosts the primary itself. This is done by specifying "syncuser@'%'" in the create user command. See the MySQL documentation to learn more about [specifying account names](https://dev.mysql.com/doc/refman/5.7/en/account-names.html).
+   In the commands below, the new replication role created is able to access the master from any machine, not just the machine that hosts the master itself. This is done by specifying "syncuser@'%'" in the create user command. See the MySQL documentation to learn more about [specifying account names](https://dev.mysql.com/doc/refman/5.7/en/account-names.html).
 
    **SQL Command**
 
@@ -95,9 +95,9 @@ The following steps prepare and configure the MySQL server hosted on-premises, i
    ![Replication Slave](./media/howto-data-in-replication/replicationslave.png)
 
 
-4. Set the primary server to read-only mode
+4. Set the master server to read-only mode
 
-   Before starting to dump out the database, the server needs to be placed in read-only mode. While in read-only mode, the primary will be unable to process any write transactions. Evaluate the impact to your business and schedule the read-only window in an off-peak time if necessary.
+   Before starting to dump out the database, the server needs to be placed in read-only mode. While in read-only mode, the master will be unable to process any write transactions. Evaluate the impact to your business and schedule the read-only window in an off-peak time if necessary.
 
    ```sql
    FLUSH TABLES WITH READ LOCK;
@@ -115,15 +115,15 @@ The following steps prepare and configure the MySQL server hosted on-premises, i
 
    ![Master Status Results](./media/howto-data-in-replication/masterstatus.png)
  
-## Dump and restore primary server
+## Dump and restore master server
 
-1. Dump all databases from primary server
+1. Dump all databases from master server
 
-   You can use mysqldump to dump databases from your primary. For details, refer to [Dump & Restore](concepts-migrate-dump-restore.md). It is unnecessary to dump MySQL library and test library.
+   You can use mysqldump to dump databases from your master. For details, refer to [Dump & Restore](concepts-migrate-dump-restore.md). It is unnecessary to dump MySQL library and test library.
 
-2. Set primary server to read/write mode
+2. Set master server to read/write mode
 
-   Once the database has been dumped, change the primary MySQL server back to read/write mode.
+   Once the database has been dumped, change the master MySQL server back to read/write mode.
 
    ```sql
    SET GLOBAL read_only = OFF;
@@ -134,21 +134,21 @@ The following steps prepare and configure the MySQL server hosted on-premises, i
 
    Restore the dump file to the server created in the Azure Database for MySQL service. Refer to [Dump & Restore](concepts-migrate-dump-restore.md) for how to restore a dump file to a MySQL server. If the dump file is large, upload it to a virtual machine in Azure within the same region as your replica server. Restore it to the Azure Database for MySQL server from the virtual machine.
 
-## Link primary and replica servers to start Data-in Replication
+## Link master and replica servers to start Data-in Replication
 
-1. Set primary server
+1. Set master server
 
    All Data-in Replication functions are done by stored procedures. You can find all procedures at [Data-in Replication Stored Procedures](reference-data-in-stored-procedures.md). The stored procedures can be run in the MySQL shell or MySQL Workbench. 
 
-   To link two servers and start replication, login to the target replica server in the Azure DB for MySQL service and set the external instance as the primary server. This is done by using the `mysql.az_replication_change_primary` stored procedure on the Azure DB for MySQL server.
+   To link two servers and start replication, login to the target replica server in the Azure DB for MySQL service and set the external instance as the master server. This is done by using the `mysql.az_replication_change_master` stored procedure on the Azure DB for MySQL server.
 
    ```sql
-   CALL mysql.az_replication_change_primary('<master_host>', '<master_user>', '<master_password>', 3306, '<master_log_file>', <master_log_pos>, '<master_ssl_ca>');
+   CALL mysql.az_replication_change_master('<master_host>', '<master_user>', '<master_password>', 3306, '<master_log_file>', <master_log_pos>, '<master_ssl_ca>');
    ```
 
-   - master_host: hostname of the primary server
-   - master_user: username for the primary server
-   - master_password: password for the primary server
+   - master_host: hostname of the master server
+   - master_user: username for the master server
+   - master_password: password for the master server
    - master_log_file: binary log file name from running `show master status`
    - master_log_pos: binary log position from running `show master status`
    - master_ssl_ca: CA certificate’s context. If not using SSL, pass in empty string.
@@ -166,17 +166,17 @@ The following steps prepare and configure the MySQL server hosted on-premises, i
    -----END CERTIFICATE-----'
    ```
 
-   Replication with SSL is set up between a primary server hosted in the domain “companya.com” and a replica server hosted in Azure Database for MySQL. This stored procedure is run on the replica. 
+   Replication with SSL is set up between a master server hosted in the domain “companya.com” and a replica server hosted in Azure Database for MySQL. This stored procedure is run on the replica. 
 
    ```sql
-   CALL mysql.az_replication_change_primary('primary.companya.com', 'syncuser', 'P@ssword!', 3306, 'mysql-bin.000002', 120, @cert);
+   CALL mysql.az_replication_change_master('master.companya.com', 'syncuser', 'P@ssword!', 3306, 'mysql-bin.000002', 120, @cert);
    ```
    *Replication without SSL*
 
-   Replication without SSL is set up between a primary server hosted in the domain “companya.com” and a replica server hosted in Azure Database for MySQL. This stored procedure is run on the replica.
+   Replication without SSL is set up between a master server hosted in the domain “companya.com” and a replica server hosted in Azure Database for MySQL. This stored procedure is run on the replica.
 
    ```sql
-   CALL mysql.az_replication_change_primary('primary.companya.com', 'syncuser', 'P@ssword!', 3306, 'mysql-bin.000002', 120, '');
+   CALL mysql.az_replication_change_master('master.companya.com', 'syncuser', 'P@ssword!', 3306, 'mysql-bin.000002', 120, '');
    ```
 
 2. Start replication
@@ -201,18 +201,18 @@ The following steps prepare and configure the MySQL server hosted on-premises, i
 
 ### Stop replication
 
-To stop replication between the primary and replica server, use the following stored procedure:
+To stop replication between the master and replica server, use the following stored procedure:
 
 ```sql
 CALL mysql.az_replication_stop;
 ```
 
 ### Remove replication relationship
 
-To remove the relationship between primary and replica server, use the following stored procedure:
+To remove the relationship between master and replica server, use the following stored procedure:
 
 ```sql
-CALL mysql.az_replication_remove_primary;
+CALL mysql.az_replication_remove_master;
 ```
 
 ### Skip replication error
@@ -224,4 +224,4 @@ CALL mysql.az_replication_skip_counter;
 ```
 
 ## Next steps
-- Learn more about [Data-in Replication](concepts-data-in-replication.md) for Azure Database for MySQL. 
+- Learn more about [Data-in Replication](concepts-data-in-replication.md) for Azure Database for MySQL. 
diff --git a/articles/mysql/reference-data-in-stored-procedures.md b/articles/mysql/reference-data-in-stored-procedures.md
@@ -8,21 +8,21 @@ manager: kfile
 editor: jasonwhowell
 ms.service: mysql
 ms.topic: article
-ms.date: 05/18/2018
+ms.date: 08/31/2018
 ---
 
 # Azure Database for MySQL Data-in Replication Stored Procedures
 
 Data-in Replication allows you to synchronize data from a MySQL server running on-premises, in virtual machines, or database services hosted by other cloud providers into the Azure Database for MySQL service.
 
-The following stored procedures are used to set up or remove Data-in Replication between a primary and replica.
+The following stored procedures are used to set up or remove Data-in Replication between a master and replica.
 
 |**Stored Procedure Name**|**Input Parameters**|**Output Parameters**|**Usage Note**|
 |-----|-----|-----|-----|
-|*mysql.az_replication_change_primary*|master_host<br/>master_user<br/>master_password<br/>master_port<br/>master_log_file<br/>master_log_pos<br/>master_ssl_ca|N/A|To transfer data with SSL mode, pass in the CA certificate’s context into the master_ssl_ca parameter. </br><br>To transfer data without SSL, pass in an empty string into the master_ssl_ca parameter.|
+|*mysql.az_replication_change_master*|master_host<br/>master_user<br/>master_password<br/>master_port<br/>master_log_file<br/>master_log_pos<br/>master_ssl_ca|N/A|To transfer data with SSL mode, pass in the CA certificate’s context into the master_ssl_ca parameter. </br><br>To transfer data without SSL, pass in an empty string into the master_ssl_ca parameter.|
 |*mysql.az_replication _start*|N/A|N/A|Starts replication.|
 |*mysql.az_replication _stop*|N/A|N/A|Stops replication.|
-|*mysql.az_replication _remove_primary*|N/A|N/A|Removes the replication relationship between the primary and replica.|
+|*mysql.az_replication _remove_master*|N/A|N/A|Removes the replication relationship between the master and replica.|
 |*mysql.az_replication_skip_counter*|N/A|N/A|Skips one replication error.|
 
-To set up data-in replication between a primary and a replica in Azure Database for MySQL, refer to [how to configure data-in replication](howto-data-in-replication.md).
+To set up data-in replication between a master and a replica in Azure Database for MySQL, refer to [how to configure data-in replication](howto-data-in-replication.md).
