Skip to content

Commit e4a6d3d

Browse files
authored
Merge pull request #19345 from MicrosoftDocs/master
5/13 PM Publish
2 parents c83d245 + 4453f6c commit e4a6d3d

File tree

4 files changed

+52
-47
lines changed

4 files changed

+52
-47
lines changed

docs/ado/reference/ado-api/executeoptionenum.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Specifies how a provider should execute a command.
2727
|**adAsyncFetchNonBlocking**|0x40|Indicates that the main thread never blocks while retrieving. If the requested row has not been retrieved, the current row automatically moves to the end of the file.<br /><br /> If you open a [Recordset](../../../ado/reference/ado-api/recordset-object-ado.md) from a [Stream](../../../ado/reference/ado-api/stream-object-ado.md) containing a persistently stored **Recordset**, **adAsyncFetchNonBlocking** will not have an effect; the operation will be synchronous and blocking.<br /><br /> **adAsynchFetchNonBlocking** has no effect when the [adCmdTableDirect](../../../ado/reference/ado-api/commandtypeenum.md) option is used to open the **Recordset**.|
2828
|**adExecuteNoRecords**|0x80|Indicates that the command text is a command or stored procedure that does not return rows (for example, a command that only inserts data). If any rows are retrieved, they are discarded and not returned.<br /><br /> **adExecuteNoRecords** can only be passed as an optional parameter to the **Command** or **Connection Execute** method.|
2929
|**adExecuteStream**|0x400|Indicates that the results of a command execution should be returned as a stream.<br /><br /> **adExecuteStream** can only be passed as an optional parameter to the **Command Execute** method.|
30-
|**adExecuteRecord**||Indicates that the **CommandText** is a command or stored procedure that returns a single row which should be returned as a **Record** object.|
30+
|**adExecuteRecord**|0x200|Indicates that the **CommandText** is a command or stored procedure that returns a single row which should be returned as a **Record** object.|
3131
|**adOptionUnspecified**|-1|Indicates that the command is unspecified.|
3232

3333
## ADO/WFC Equivalent

docs/linux/sql-server-linux-active-directory-authentication.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,11 @@ CONTOSO.COM = {
259259
> [!NOTE]
260260
> While it is not recommended, it is possible to use utilities, such as **realmd**, that set up SSSD while joining the Linux host to the domain, while configuring **disablesssd** to true so that SQL Server uses openldap calls instead of SSSD for Active Directory related calls.
261261
262+
> [!NOTE]
263+
> SQL Server login by using an FQDN (for example, CONTOSO.COM\Username) is not supported. Use the CONTOSO\Username format.
264+
>
265+
> SQL Server logins from Domain Local groups are not supported. Use Global Security Domain groups instead.
266+
262267
## Next steps
263268
264269
In this tutorial, we walked through how to set up Active Directory authentication with SQL Server on Linux. You learned how to:
@@ -272,4 +277,4 @@ In this tutorial, we walked through how to set up Active Directory authenticatio
272277
Next, explore other security scenarios for SQL Server on Linux.
273278
274279
> [!div class="nextstepaction"]
275-
> [Encrypting Connections to SQL Server on Linux](sql-server-linux-encrypted-connections.md)
280+
> [Encrypting Connections to SQL Server on Linux](sql-server-linux-encrypted-connections.md)

docs/machine-learning/administration/monitor-sql-server-machine-learning-services-using-dynamic-management-views.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Use dynamic management views (DMVs) to monitor the execution of external scripts
1818
In this article, you will find the DMVs that are specific for SQL Server Machine Learning Services. You will also find example queries that show:
1919

2020
+ Settings and configuration options for machine learning
21-
+ Active sessions running external Python or scripts
21+
+ Active sessions running external Python or R scripts
2222
+ Execution statistics for the external runtime for Python and R
2323
+ Performance counters for external scripts
2424
+ Memory usage for the OS, SQL Server, and external resource pools

0 commit comments

Comments
 (0)