Skip to content

Commit 187a473

Browse files
v-aljev-alje
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into release-remove-sscurrent-tag
2 parents 7b8ad49 + 14c3a4b commit 187a473

7 files changed

Lines changed: 45 additions & 46 deletions

‎docs/relational-databases/security/encryption/sql-server-connector-registry-modification.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ To upgrade the SQL Server Connector (Version: 1.0.5.0 with a date of September 2
6666
6767
**System Requirements** - Supported SQL Server versions:
6868

69-
- SQL Server 2019 RTM Enterprise 64-bit
69+
- SQL Server 2019 RTM Enterprise or Standard 64-bit
7070
- SQL Server 2017 RTM Enterprise 64-bit
7171
- SQL Server 2016 RTM Enterprise 64-bit
7272
- SQL Server 2014 RTM Enterprise 64-bit
@@ -162,4 +162,4 @@ REG QUERY "HKLM\SYSTEM\ControlSet001\Services\EventLog\Application\SQL Server Co
162162
- For additional sample scripts, see the blog at [SQL Server Transparent Data Encryption and Extensible Key Management with Azure Key Vault](https://techcommunity.microsoft.com/t5/sql-server/intro-sql-server-transparent-data-encryption-and-extensible-key/ba-p/1427549)
163163
- [Extensible Key Management (EKM)](extensible-key-management-ekm.md)
164164
- [Extensible Key Management using Azure Key Vault](extensible-key-management-using-azure-key-vault-sql-server.md)
165-
- [SQL Server Connector Maintenance & Troubleshooting](../../../relational-databases/security/encryption/sql-server-connector-maintenance-troubleshooting.md)
165+
- [SQL Server Connector Maintenance & Troubleshooting](../../../relational-databases/security/encryption/sql-server-connector-maintenance-troubleshooting.md)

‎docs/relational-databases/system-stored-procedures/sp-change-log-shipping-secondary-primary-transact-sql.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ sp_change_log_shipping_secondary_primary
5555
The directory on the secondary server where backup files are copied to. *backup_destination_directory* is **nvarchar(500)** and cannot be NULL.
5656

5757
`[ @file_retention_period = ] 'file_retention_period'`
58-
Is the length of time in minutes in which the history will be retained. *history_retention_period* is **int**, with a default of NULL. A value of 14420 will be used if none is specified.
58+
Is the length of time in minutes in which the backup files will be retained. *file_retention_period* is **int**, with a default of NULL. A value of 14420 will be used if none is specified.
5959

6060
`[ @monitor_server_security_mode = ] 'monitor_server_security_mode'`
6161
The security mode used to connect to the monitor server.

‎docs/sql-server/editions-and-components-of-sql-server-2016.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: This article describes features supported by the various editions o
55
ms.custom:
66
- seo-lt-2019
77
- sqlfreshmay19
8-
ms.date: 07/22/2020
8+
ms.date: 03/26/2021
99
ms.prod: sql
1010
ms.reviewer: ""
1111
ms.technology: release-landing
@@ -34,7 +34,6 @@ helpviewer_keywords:
3434
- "editions [SQL Server], about edition options"
3535
- "Setup [SQL Server]"
3636
- "CPSA"
37-
ms.assetid: e5186f02-dd91-47d0-8fa4-de3f41c76903
3837
author: "MikeRayMSFT"
3938
ms.author: "mikeray"
4039
---
@@ -178,7 +177,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
178177
|Table and index partitioning|Yes|Yes <sup>2</sup>|Yes <sup>2</sup>|Yes <sup>2</sup>|Yes <sup>2</sup>|
179178
|Data compression|Yes|Yes <sup>2</sup>|Yes <sup>2</sup>|Yes <sup>2</sup>|Yes <sup>2</sup>|
180179
|Resource Governor|Yes|No|No|No|No|
181-
|Partitioned Table Parallelism|Yes|No|No|No|No|
180+
|Partitioned Table Parallelism|Yes|Yes <sup>2</sup>|Yes <sup>2</sup>|Yes <sup>2</sup>|Yes <sup>2</sup>|
182181
|Multiple Filestream containers|Yes|Yes <sup>2</sup>|Yes <sup>2</sup>|Yes <sup>2</sup>|Yes <sup>2</sup>|
183182
|NUMA Aware Large Page Memory and Buffer Array Allocation|Yes|No <sup>4</sup>|No|No|No|
184183
|Buffer Pool Extension|Yes|Yes|No|No|No|

‎docs/sql-server/editions-and-components-of-sql-server-2017.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Editions and supported features"
33
titleSuffix: SQL Server 2017
44
description: This article describes features supported by the various editions of SQL Server 2017, which accommodate different performance, runtime, and price requirements.
55
ms.custom: "seo-lt-2019"
6-
ms.date: "12/13/2019"
6+
ms.date: "03/26/2021"
77
ms.prod: sql
88
ms.reviewer: ""
99
ms.technology: release-landing
@@ -184,7 +184,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
184184
|Table and index partitioning|Yes|Yes|Yes|Yes|Yes|
185185
|Data compression|Yes|Yes|Yes|Yes|Yes|
186186
|Resource Governor|Yes|No|No|No|No|
187-
|Partitioned Table Parallelism|Yes|No|No|No|No|
187+
|Partitioned Table Parallelism|Yes|Yes|Yes|Yes|Yes|
188188
|Multiple Filestream containers|Yes|Yes|Yes|Yes|Yes|
189189
|NUMA Aware Large Page Memory and Buffer Array Allocation|Yes|No|No|No|No|
190190
|Buffer Pool Extension|Yes|Yes|No|No|No|

‎docs/sql-server/editions-and-components-of-sql-server-version-15.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
description: "Editions and supported features of [!INCLUDE[sssql19-md](../includes/sssql19-md.md)]"
3-
title: "Editions and supported features of SQL Server 2019 | Microsoft Docs"
3+
title: "Editions and supported features of SQL Server 2019"
44
ms.custom: ""
5-
ms.date: 11/04/2019
5+
ms.date: 03/26/2021
66
ms.prod: sql
77
ms.reviewer: ""
88
ms.technology: release-landing
@@ -198,7 +198,7 @@ The Developer edition continues to support only 1 client for [[!INCLUDE[ssNoVers
198198
|Table and index partitioning|Yes|Yes|Yes|Yes|Yes|
199199
|Data compression|Yes|Yes|Yes|Yes|Yes|
200200
|Resource governor|Yes|No|No|No|No|
201-
|Partitioned table parallelism|Yes|No|No|No|No|
201+
|Partitioned table parallelism|Yes|Yes|Yes|Yes|Yes|
202202
|Multiple filestream containers|Yes|Yes|Yes|Yes|Yes|
203203
|NUMA aware and large page memory and buffer array allocation|Yes|No|No|No|No|
204204
|Buffer pool extension|Yes|Yes|No|No|No|

‎docs/t-sql/functions/logical-functions-greatest-transact-sql.md‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description: "Logical Functions - GREATEST (Transact-SQL)"
33
title: "GREATEST (Transact-SQL)"
44
ms.custom: ""
5-
ms.date: "04/09/2021"
5+
ms.date: "04/14/2021"
66
ms.prod: sql
77
ms.prod_service: "database-engine, sql-database"
88
ms.technology: t-sql
@@ -74,14 +74,14 @@ GREATEST ( expression1 [ ,...expressionN ] )
7474
The scale of the return type is determined by the scale of the argument with the highest precedence data type.
7575

7676
```sql
77-
SELECT GREATEST ( '6.62', 3.1415, N'7' ) AS Greatest;
77+
SELECT GREATEST ( '6.62', 3.1415, N'7' ) AS GreatestVal;
7878
GO
7979
```
8080

8181
[!INCLUDE[ssResult](../../includes/ssresult-md.md)]
8282

8383
```
84-
Greatest
84+
GreatestVal
8585
--------
8686
7.0000
8787
@@ -93,14 +93,14 @@ Greatest
9393
The following example returns the maximum value from the list of character constants that is provided.
9494

9595
```sql
96-
SELECT GREATEST ('Glacier', N'Joshua Tree', 'Mount Rainier') AS Greatest;
96+
SELECT GREATEST ('Glacier', N'Joshua Tree', 'Mount Rainier') AS GreatestString;
9797
GO
9898
```
9999

100100
[!INCLUDE[ssResult](../../includes/ssresult-md.md)]
101101

102102
```
103-
Greatest
103+
GreatestString
104104
-------------
105105
Mount Rainier
106106
@@ -116,8 +116,8 @@ USE AdventureWorks2019;
116116
GO
117117

118118
SELECT sp.SalesQuota, sp.SalesYTD, sp.SalesLastYear
119-
, GREATEST(sp.SalesQuota, sp.SalesYTD, sp.SalesLastYear) AS Greatest
120-
FROM sales.SalesPerson AS sp
119+
, GREATEST(sp.SalesQuota, sp.SalesYTD, sp.SalesLastYear) AS Sales
120+
FROM Sales.SalesPerson AS sp
121121
WHERE sp.SalesYTD < 3000000;
122122
GO
123123

@@ -126,7 +126,7 @@ GO
126126
[!INCLUDE[ssResult](../../includes/ssresult-md.md)]
127127

128128
```
129-
SalesQuota SalesYTD SalesLastYear Greatest
129+
SalesQuota SalesYTD SalesLastYear Sales
130130
131131
--------------------- --------------------- --------------------- ---------------------
132132
NULL 559697.5639 .0000 559697.5639
@@ -150,27 +150,27 @@ SalesQuota SalesYTD SalesLastYear Greatest
150150
This example uses `GREATEST` to determine the maximum value of a list of local variables within the predicate of a `WHERE` clause.
151151

152152
```sql
153-
CREATE TABLE studies (
154-
Variable varchar(10) NOT NULL,
153+
CREATE TABLE dbo.studies (
154+
VarX varchar(10) NOT NULL,
155155
Correlation decimal(4, 3) NULL
156156
);
157157

158-
INSERT INTO studies VALUES ('Var1', 0.2), ('Var2', 0.825), ('Var3', 0.61);
158+
INSERT INTO dbo.studies VALUES ('Var1', 0.2), ('Var2', 0.825), ('Var3', 0.61);
159159
GO
160160

161161
DECLARE @PredictionA DECIMAL(2,1) = 0.7;
162162
DECLARE @PredictionB DECIMAL(3,1) = 0.65;
163163

164-
SELECT Variable, Correlation
165-
FROM studies
164+
SELECT VarX, Correlation
165+
FROM dbo.studies
166166
WHERE Correlation > GREATEST(@PredictionA, @PredictionB);
167167
GO
168168
```
169169

170170
[!INCLUDE[ssResult](../../includes/ssresult-md.md)]
171171

172172
```
173-
Variable Correlation
173+
VarX Correlation
174174
---------- -----------
175175
Var2 .825
176176
@@ -182,18 +182,18 @@ Var2 .825
182182
This example uses `GREATEST` to determine the maximum value of a list that includes columns, constants, and variables.
183183

184184
```sql
185-
CREATE TABLE products (
185+
CREATE TABLE dbo.products (
186186
prod_id int IDENTITY(1,1),
187187
listprice smallmoney NULL
188188
);
189189

190-
INSERT INTO products VALUES (14.99), (49.99), (24.99);
190+
INSERT INTO dbo.products VALUES (14.99), (49.99), (24.99);
191191
GO
192192

193193
DECLARE @PriceX smallmoney = 19.99;
194194

195195
SELECT GREATEST(listprice, 0, @PriceX) as GreatestPrice
196-
FROM products;
196+
FROM dbo.products;
197197
GO
198198
```
199199

‎docs/t-sql/functions/logical-functions-least-transact-sql.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description: "Logical Functions - LEAST (Transact-SQL)"
33
title: "LEAST (Transact-SQL)"
44
ms.custom: ""
5-
ms.date: "04/09/2021"
5+
ms.date: "04/14/2021"
66
ms.prod: sql
77
ms.prod_service: "database-engine, sql-database"
88
ms.technology: t-sql
@@ -74,14 +74,14 @@ LEAST ( expression1 [ ,...expressionN ] )
7474
The scale of the return type is determined by the scale of the argument with the highest precedence data type.
7575

7676
```sql
77-
SELECT LEAST ( '6.62', 3.1415, N'7' ) AS Least;
77+
SELECT LEAST ( '6.62', 3.1415, N'7' ) AS LeastVal;
7878
GO
7979
```
8080

8181
[!INCLUDE[ssResult](../../includes/ssresult-md.md)]
8282

8383
```
84-
Least
84+
LeastVal
8585
-------
8686
3.1415
8787
@@ -93,14 +93,14 @@ Least
9393
The following example returns the minimum value from the list of character constants that is provided.
9494

9595
```sql
96-
SELECT LEAST ('Glacier', N'Joshua Tree', 'Mount Rainier') AS Least;
96+
SELECT LEAST ('Glacier', N'Joshua Tree', 'Mount Rainier') AS LeastString;
9797
GO
9898
```
9999

100100
[!INCLUDE[ssResult](../../includes/ssresult-md.md)]
101101

102102
```
103-
Least
103+
LeastString
104104
-------------
105105
Glacier
106106
@@ -116,8 +116,8 @@ USE AdventureWorks2019;
116116
GO
117117

118118
SELECT sp.SalesQuota, sp.SalesYTD, sp.SalesLastYear
119-
, LEAST(sp.SalesQuota, sp.SalesYTD, sp.SalesLastYear) AS Least
120-
FROM sales.SalesPerson AS sp
119+
, LEAST(sp.SalesQuota, sp.SalesYTD, sp.SalesLastYear) AS Sales
120+
FROM Sales.SalesPerson AS sp
121121
WHERE sp.SalesYTD < 3000000;
122122
GO
123123

@@ -126,7 +126,7 @@ GO
126126
[!INCLUDE[ssResult](../../includes/ssresult-md.md)]
127127

128128
```
129-
SalesQuota SalesYTD SalesLastYear Least
129+
SalesQuota SalesYTD SalesLastYear Sales
130130
--------------------- --------------------- --------------------- ---------------------
131131
NULL 559697.5639 .0000 .0000
132132
250000.0000 1453719.4653 1620276.8966 250000.0000
@@ -149,27 +149,27 @@ SalesQuota SalesYTD SalesLastYear Least
149149
This example uses `LEAST` to determine the minimum value of a list of local variables within the predicate of a `WHERE` clause.
150150

151151
```sql
152-
CREATE TABLE studies (
153-
Variable varchar(10) NOT NULL,
152+
CREATE TABLE dbo.studies (
153+
VarX varchar(10) NOT NULL,
154154
Correlation decimal(4, 3) NULL
155155
);
156156

157-
INSERT INTO studies VALUES ('Var1', 0.2), ('Var2', 0.825), ('Var3', 0.61);
157+
INSERT INTO dbo.studies VALUES ('Var1', 0.2), ('Var2', 0.825), ('Var3', 0.61);
158158
GO
159159

160160
DECLARE @PredictionA DECIMAL(2,1) = 0.7;
161161
DECLARE @PredictionB DECIMAL(3,1) = 0.65;
162162

163-
SELECT Variable, Correlation
164-
FROM studies
163+
SELECT VarX, Correlation
164+
FROM dbo.studies
165165
WHERE Correlation < LEAST(@PredictionA, @PredictionB);
166166
GO
167167
```
168168

169169
[!INCLUDE[ssResult](../../includes/ssresult-md.md)]
170170

171171
```
172-
Variable Correlation
172+
VarX Correlation
173173
---------- -----------
174174
Var1 .200
175175
Var3 .610
@@ -182,18 +182,18 @@ Var3 .610
182182
This example uses `LEAST` to determine the minimum value of a list that includes columns, constants, and variables.
183183

184184
```sql
185-
CREATE TABLE products (
186-
prod_id int IDENTITY(1,1),
185+
CREATE TABLE dbo.products (
186+
prod_id INT IDENTITY(1,1),
187187
listprice smallmoney NULL
188188
);
189189

190-
INSERT INTO products VALUES (14.99), (49.99), (24.99);
190+
INSERT INTO dbo.products VALUES (14.99), (49.99), (24.99);
191191
GO
192192

193193
DECLARE @PriceX smallmoney = 19.99;
194194

195195
SELECT LEAST(listprice, 40, @PriceX) as LeastPrice
196-
FROM products;
196+
FROM dbo.products;
197197
GO
198198
```
199199

0 commit comments

Comments
 (0)