Skip to content

Commit a878fec

Browse files
markingmynamemarkingmyname
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into ADS
2 parents c5f5d14 + 8e66b60 commit a878fec

20 files changed

Lines changed: 128 additions & 93 deletions

‎docs/big-data-cluster/deployment-upgrade.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Currently, the only way to upgrade a big data cluster to a new release is to man
3737
For CTP 2.3 or higher, run the following command. Replace `ctp3.1` in the command with the version of **mssqlctl** that you are uninstalling. If the version is prior to CTP 3.1, add a dash before the version number (for example, `ctp-2.5`).
3838

3939
```powershell
40-
pip3 uninstall -r https://mcr.microsoft.com/python/ctp3.1/mssqlctl/requirements.txt
40+
pip3 uninstall -r https://private-repo.microsoft.com/python/ctp3.1/mssqlctl/requirements.txt
4141
```
4242

4343
1. Install the latest version of **azdata**. The following commands install **azdata** for CTP 3.2:

‎docs/connect/odbc/linux-mac/programming-guidelines.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.prod_service: connectivity
77
ms.reviewer: ""
88
ms.technology: connectivity
99
ms.topic: conceptual
10-
author: MightyPen
10+
author: v-makouz
1111
ms.author: genemi
1212
---
1313
# Programming Guidelines
@@ -111,11 +111,11 @@ There are some encoding conversion differences between Windows and several versi
111111

112112
In ODBC Driver 13 and 13.1, when UTF-8 multibyte characters or UTF-16 surrogates are split across SQLPutData buffers, it results in data corruption. Use buffers for streaming SQLPutData that do not end in partial character encodings. This limitation has been removed with ODBC Driver 17.
113113

114-
## OpenSSL
114+
## <a name="bkmk-openssl"></a>OpenSSL
115115
Starting with version 17.4, the driver loads OpenSSL dynamically, which allows it to run on systems that have either version 1.0 or 1.1 without a need for separate driver files. When multiple versions of OpenSSL are present, the driver will attempt to load the latest one. The driver currently supports OpenSSL 1.0.x and 1.1.x
116116

117-
> [!NOTE]
118-
> A potential conflict may occur if the application that uses the driver (or one of its components) is linked with or dynamically loads a different version of OpenSSL. If several versions of OpenSSL are present on the system and the application uses it, it is highly recommended that one be extra careful in making sure that the version loaded by the application and the driver do not mismatch, as the errors could corrupt memory and thus will not necessarily manifest in obvious or consistent ways.
117+
> [!NOTE]
118+
> A potential conflict may occur if the application that uses the driver (or one of its components) is linked with or dynamically loads a different version of OpenSSL. If several versions of OpenSSL are present on the system and the application uses it, it is highly recommended that one be extra careful in making sure that the version loaded by the application and the driver do not mismatch, as the errors could corrupt memory and thus will not necessarily manifest in obvious or consistent ways.
119119
120120
## Additional Notes
121121

‎docs/connect/odbc/linux-mac/release-notes-odbc-sql-server-linux-mac.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.prod_service: connectivity
77
ms.reviewer: "MightyPen"
88
ms.technology: connectivity
99
ms.topic: conceptual
10-
author: karinazhou
10+
author: v-makouz
1111
ms.author: v-jizho2
1212
manager: kenvh
1313
---
@@ -29,6 +29,15 @@ NOW NEW FILE NAME: linux-mac/release-notes-odbc-sql-server-linux-mac.md
2929
Thank you.
3030
GeneMi. 2019/04/03.
3131
-->
32+
## 17.4, August 2019
33+
34+
| Feature added | Details |
35+
| :------------ | :------ |
36+
| Always Encrypted with Secure Enclaves. | See [Using Always Encrypted with the ODBC Driver](../using-always-encrypted-with-the-odbc-driver.md). |
37+
| Dynamic loading of OpenSSL | See [Programming Guidelines](programming-guidelines.md#bkmk-openssl). |
38+
| Configurable TCP Keep Alive settings. | See [Connecting to SQL Server](connection-string-keywords-and-data-source-names-dsns.md). |
39+
| Bug fixes. | See [Bug fixes](../bug-fixes.md). |
40+
| &nbsp; | &nbsp; |
3241

3342
## 17.3, February 2019
3443

‎docs/database-engine/configure-windows/configure-the-network-packet-size-server-configuration-option.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ ms.author: mikeray
4848

4949
- The maximum network packet size for encrypted connections is 16,383 bytes.
5050

51+
> [!NOTE]
52+
> If MARS is enabled, the SMUX provider will add a 16-byte header to the packet before SSL encryption, reducing the maximum network packet size to 16368 bytes.
53+
5154
### <a name="Recommendations"></a> Recommendations
5255

5356
- This option is an advanced option and should be changed only by an experienced database administrator or certified [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] professional.

‎docs/database-engine/configure-windows/scm-services-configure-sql-server-error-logs.md‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,28 @@ author: MikeRayMSFT
1414
ms.author: mikeray
1515
---
1616
# SCM Services - Configure SQL Server Error Logs
17+
1718
[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
1819
This topic describes how to view or modify the way [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] error logs are recycled.
19-
20+
2021
## To open the Configure SQL Server Error Logs dialog box
22+
23+
1. In Object Explorer, expand the instance of SQL Server, expand **Management**, right-click **SQL Server Logs**, and then click **Configure**.
24+
25+
2. In the **Configure SQL Server Error Logs** dialog box, choose from the following options.
26+
27+
a. Log files count
28+
29+
**Limit the number of the error log files before they are recycled**
30+
31+
Check to limit the number of error logs created before they are recycled. A new error log is created each time an instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] is started. [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] retains backups of the previous six logs, unless you check this option, and specify a different maximum number of error log files below.
2132

22-
1. In Object Explorer, expand the instance of SQL Server, expand **Management**, right-click **SQL Server Logs**, and then click **Configure**.
23-
24-
2. In the **Configure SQL Server Error Logs** dialog box, choose from the following options.
25-
26-
**Limit the number of the error log files before they are recycled**
27-
Check to limit the number of error logs created before they are recycled. A new error log is created each time an instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] is started. [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] retains backups of the previous six logs, unless you check this option, and specify a different maximum number of error log files below.
28-
29-
**Maximum number of error log files**
30-
Specify the maximum number of error log files created before they are recycled. The default is 6, which is the number of previous backup logs [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] retains before recycling them.
31-
32-
33+
**Maximum number of error log files**
34+
35+
Specify the maximum number of error log files created before they are recycled. The default is 6, which is the number of previous backup logs [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] retains before recycling them.
36+
37+
b. Log file size
38+
39+
**Maximum size for error log file in KB**
40+
41+
You can set the size amount of each file in KB. If you leave it at 0 the log size is unlimited.

‎docs/relational-databases/import-export/examples-of-bulk-access-to-data-in-azure-blob-storage.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Bulk access to Azure blob storage from SQL Server, requires at least [!INCLUDE[s
2626

2727
> [!IMPORTANT]
2828
> All the paths to the container and to the files on blob are `CASE SENSITIVE`. If not correct, it might return error like "Cannot bulk load. The file "file.csv" does not exist or you don't have file access rights."
29-
> "
3029
3130

3231
## Create the credential
@@ -36,23 +35,26 @@ All of the examples below require a database scoped credential referencing a sha
3635
> [!IMPORTANT]
3736
> The external data source must be created with a database scoped credential that uses the `SHARED ACCESS SIGNATURE` identity. To create a shared access signature for your storage account, see the **Shared access signature** property on the storage account property page, in the Azure portal. For more information on shared access signatures, see [Using Shared Access Signatures (SAS)](https://docs.microsoft.com/azure/storage/storage-dotnet-shared-access-signature-part-1). For more information on credentials, see [CREATE DATABASE SCOPED CREDENTIAL](../../t-sql/statements/create-database-scoped-credential-transact-sql.md).
3837
39-
Create a database scoped credential using the `IDENTITY` which must be `SHARED ACCESS SIGNATURE`. Use the secret from your Azure portal. For example:
38+
Create a database scoped credential using the `IDENTITY` which must be `SHARED ACCESS SIGNATURE`. Use the SAS token generated for the blob storage account. Verify that your SAS token does not have a leading `?`, that you have at least read permission on the object that should be loaded, and that the expiration period is valid (all dates are in UTC time).
39+
40+
For example:
4041

4142
```sql
4243
CREATE DATABASE SCOPED CREDENTIAL UploadInvoices
4344
WITH IDENTITY = 'SHARED ACCESS SIGNATURE',
44-
SECRET = 'QLYMgmSXMklt%2FI1U6DcVrQixnlU5Sgbtk1qDRakUBGs%3D';
45+
SECRET = 'sv=2018-03-28&ss=b&srt=sco&sp=rwdlac&se=2019-08-31T02:25:19Z&st=2019-07-30T18:25:19Z&spr=https&sig=KS51p%2BVnfUtLjMZtUTW1siyuyd2nlx294tL0mnmFsOk%3D';
4546
```
4647

4748

4849
## Accessing data in a CSV file referencing an Azure blob storage location
49-
The following example uses an external data source pointing to an Azure storage account, named `newinvoices`.
50+
The following example uses an external data source pointing to an Azure storage account, named `newinvoices`.
51+
5052
```sql
5153
CREATE EXTERNAL DATA SOURCE MyAzureInvoices
5254
WITH (
5355
TYPE = BLOB_STORAGE,
5456
LOCATION = 'https://newinvoices.blob.core.windows.net',
55-
CREDENTIAL = UploadInvoices
57+
CREDENTIAL = 'UploadInvoices';
5658
);
5759
```
5860

‎docs/relational-databases/replication/tutorial-preparing-the-server-for-replication.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ If your SQL Server Management Studio instance is running with administrative rig
207207
>[!NOTE]
208208
> If the SQL Agent doesn't visibly start, right-click the SQL Server Agent in SSMS and select **Refresh**. If it's still in the stopped state, start it manually from SQL Server Configuration Manager.
209209
210-
### Set database permissions at the publisher
210+
## Set database permissions
211211

212212
1. In [!INCLUDE[ssManStudioFull](../../includes/ssmanstudiofull-md.md)], expand **Security**, right-click **Logins**, and then select **New Login**:
213213

@@ -228,6 +228,8 @@ If your SQL Server Management Studio instance is running with administrative rig
228228
5. Repeat steps 1-4 to create a login for the other local accounts (repl_distribution, repl_logreader, and repl_merge). These logins must also be mapped to users who are members of the **db_owner** fixed database role in the **distribution** and **AdventureWorks** databases.
229229

230230
![View of all four accounts in Object Explorer](media/tutorial-preparing-the-server-for-replication/usersinssms.png)
231+
232+
6. Repeat steps 1-4 on the subscriber for the distribution agent and the merge agent, changing the machine name to that of the subscriber.
231233

232234

233235
For more information, see:

‎docs/relational-databases/replication/types-of-replication.md‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,23 @@ ms.author: "mathoma"
1616
# Types of Replication
1717
[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
1818
[!INCLUDE[msCoName](../../includes/msconame-md.md)] [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] provides the following types of replication for use in distributed applications:
19-
20-
- Transactional replication. For more information, see [Transactional Replication](../../relational-databases/replication/transactional/transactional-replication.md).
21-
22-
- Merge replication. For more information, see [Merge Replication](../../relational-databases/replication/merge/merge-replication.md).
23-
24-
- Snapshot replication. For more information, see [Snapshot Replication](../../relational-databases/replication/snapshot-replication.md).
25-
26-
The type of replication you choose for an application depends on many factors, including the physical replication environment, the type and quantity of data to be replicated, and whether the data is updated at the Subscriber. The physical environment includes the number and location of computers involved in replication and whether these computers are clients (workstations, laptops, or handheld devices) or servers.
27-
28-
Each type of replication typically begins with an initial synchronization of the published objects between the Publisher and Subscribers. This initial synchronization can be performed by replication with a *snapshot*, which is a copy of all of the objects and data specified by a publication. After the snapshot is created, it is delivered to the Subscribers. For some applications, snapshot replication is all that is required. For other types of applications, it is important that subsequent data changes flow to the Subscriber incrementally over time. Some applications also require that changes flow from the Subscriber back to the Publisher. Transactional replication and merge replication provide options for these types of applications.
29-
30-
Data changes are not tracked for snapshot replication; each time a snapshot is applied, it completely overwrites the existing data. Transactional replication tracks changes through the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] transaction log, and merge replication tracks changes through triggers and metadata tables.
31-
19+
20+
| **Type** | **Description** |
21+
|:-------- | :-------------- |
22+
| [Transactional replication](transactional/transactional-replication.md)| Changes at the Publisher are delivered to the Subscriber as they occur (in near real time). The data changes are applied to the Subscriber in the same order and within the same transaction boundaries as they occurred on the publisher. |
23+
| [Merge replication](merge/merge-replication.md) | Data can be changed on both the Publisher and Subscriber, and are tracked with triggers. The Subscriber synchronizes with the Publisher when connected to the network and exchanges all rows that have changed between the Publisher and Subscriber since the last time synchronization occurred. |
24+
| [Snapshot replication](snapshot-replication.md) | Applies a snapshot from the Publisher to the Subscriber, which distributes data exactly as it appears at a specific moment in time, and does not monitor for updates to the data. When synchronization occurs, the entire snapshot is generated and sent to Subscribers.|
25+
| [Peer-to-peer](transactional/peer-to-peer-transactional-replication.md) | Built on the foundation of transactional replication, peer-to-peer replication propagates transactionally consistent changes in near real-time between multiple server instances. |
26+
| [Bidirectional](transactional/bidirectional-transactional-replication.md)| Bidirectional transactional replication is a specific transactional replication topology that allows two servers to exchange changes with each other: each server publishes data and then subscribes to a publication with the same data from the other server. |
27+
| [Updatable Subscriptions](transactional/updatable-subscriptions-for-transactional-replication.md) | Built on the foundation of transactional replication, when data is updated at a Subscriber for an updatable subscription, it is first propagated to the Publisher and then propagated to other Subscribers. |
28+
29+
30+
The type of replication you choose for an application depends on many factors, including the physical replication environment, the type and quantity of data to be replicated, and whether the data is updated at the Subscriber. The physical environment includes the number and location of computers involved in replication and whether these computers are clients (workstations, laptops, or handheld devices) or servers.
31+
32+
Each type of replication typically begins with an initial synchronization of the published objects between the Publisher and Subscribers. This initial synchronization can be performed by replication with a *snapshot*, which is a copy of all of the objects and data specified by a publication. After the snapshot is created, it is delivered to the Subscribers. For some applications, snapshot replication is all that is required. For other types of applications, it is important that subsequent data changes flow to the Subscriber incrementally over time. Some applications also require that changes flow from the Subscriber back to the Publisher. Transactional replication and merge replication provide options for these types of applications.
33+
34+
3235
## See Also
33-
[Replication Agents Overview](../../relational-databases/replication/agents/replication-agents-overview.md)
36+
[Replication Agents Overview](../../relational-databases/replication/agents/replication-agents-overview.md)
3437

3538

‎docs/relational-databases/security/auditing/sql-server-audit-action-groups-and-actions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ ms.author: vanto
176176

177177
|Action group name|Description|
178178
|-----------------------|-----------------|
179-
|AUDIT_ CHANGE_GROUP|This event is raised whenever one of the following commands are issued:<br /><br /> CREATE SERVER AUDIT<br /><br /> ALTER SERVER AUDIT<br /><br /> DROP SERVER AUDIT<br /><br /> CREATE SERVER AUDIT SPECIFICATION<br /><br /> ALTER SERVER AUDIT SPECIFICATION<br /><br /> DROP SERVER AUDIT SPECIFICATION<br /><br /> CREATE DATABASE AUDIT SPECIFICATION<br /><br /> ALTER DATABASE AUDIT SPECIFICATION<br /><br /> DROP DATABASE AUDIT SPECIFICATION|
179+
|AUDIT_CHANGE_GROUP|This event is raised whenever one of the following commands are issued:<br /><br /> CREATE SERVER AUDIT<br /><br /> ALTER SERVER AUDIT<br /><br /> DROP SERVER AUDIT<br /><br /> CREATE SERVER AUDIT SPECIFICATION<br /><br /> ALTER SERVER AUDIT SPECIFICATION<br /><br /> DROP SERVER AUDIT SPECIFICATION<br /><br /> CREATE DATABASE AUDIT SPECIFICATION<br /><br /> ALTER DATABASE AUDIT SPECIFICATION<br /><br /> DROP DATABASE AUDIT SPECIFICATION|
180180

181181
## Related Content
182182
[Create a Server Audit and Server Audit Specification](../../../relational-databases/security/auditing/create-a-server-audit-and-server-audit-specification.md)

‎docs/relational-databases/security/auditing/sql-server-audit-database-engine.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ monikerRange: "=azuresqldb-mi-current||>=sql-server-2016||=sqlallproducts-allver
161161

162162
|Catalog views|Description|
163163
|-------------------|-----------------|
164-
|[sys.database_ audit_specifications](../../../relational-databases/system-catalog-views/sys-database-audit-specifications-transact-sql.md)|Contains information about the database audit specifications in a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] audit on a server instance.|
164+
|[sys.database_audit_specifications](../../../relational-databases/system-catalog-views/sys-database-audit-specifications-transact-sql.md)|Contains information about the database audit specifications in a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] audit on a server instance.|
165165
|[sys.database_audit_specification_details](../../../relational-databases/system-catalog-views/sys-database-audit-specification-details-transact-sql.md)|Contains information about the database audit specifications in a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] audit on a server instance for all databases.|
166166
|[sys.server_audits](../../../relational-databases/system-catalog-views/sys-server-audits-transact-sql.md)|Contains one row for each [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] audit in a server instance.|
167167
|[sys.server_audit_specifications](../../../relational-databases/system-catalog-views/sys-server-audit-specifications-transact-sql.md)|Contains information about the server audit specifications in a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] audit on a server instance.|

0 commit comments

Comments
 (0)