Skip to content

Commit 51cfb86

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into release-2016-cu
2 parents 559c1e0 + ea0e104 commit 51cfb86

75 files changed

Lines changed: 247 additions & 176 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.openpublishing.redirection.json

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41948,6 +41948,11 @@
4194841948
{
4194941949
"source_path": "docs/advanced-analytics/common-issues-external-script-execution.md",
4195041950
"redirect_url": "/sql/machine-learning/common-issues-external-script-execution",
41951+
"redirect_document_id": false
41952+
},
41953+
{
41954+
"source_path": "docs/machine-learning/common-issues-external-script-execution.md",
41955+
"redirect_url": "/sql/machine-learning/troubleshooting/common-issues-external-script-execution",
4195141956
"redirect_document_id": true
4195241957
},
4195341958
{
@@ -41978,6 +41983,11 @@
4197841983
{
4197941984
"source_path": "docs/advanced-analytics/data-collection-ml-troubleshooting-process.md",
4198041985
"redirect_url": "/sql/machine-learning/data-collection-ml-troubleshooting-process",
41986+
"redirect_document_id": false
41987+
},
41988+
{
41989+
"source_path": "docs/machine-learning/data-collection-ml-troubleshooting-process.md",
41990+
"redirect_url": "/sql/machine-learning/troubleshooting/data-collection-ml-troubleshooting-process",
4198141991
"redirect_document_id": true
4198241992
},
4198341993
{
@@ -42038,6 +42048,11 @@
4203842048
{
4203942049
"source_path": "docs/advanced-analytics/known-issues-for-sql-server-machine-learning-services.md",
4204042050
"redirect_url": "/sql/machine-learning/known-issues-for-sql-server-machine-learning-services",
42051+
"redirect_document_id": false
42052+
},
42053+
{
42054+
"source_path": "docs/machine-learning/known-issues-for-sql-server-machine-learning-services.md",
42055+
"redirect_url": "/sql/machine-learning/troubleshooting/known-issues-for-sql-server-machine-learning-services",
4204142056
"redirect_document_id": true
4204242057
},
4204342058
{
@@ -42048,6 +42063,11 @@
4204842063
{
4204942064
"source_path": "docs/machine-learning/machine-learning-troubleshooting-faq.md",
4205042065
"redirect_url": "/sql/machine-learning/machine-learning-troubleshooting-overview",
42066+
"redirect_document_id": false
42067+
},
42068+
{
42069+
"source_path": "docs/machine-learning/machine-learning-troubleshooting-overview.md",
42070+
"redirect_url": "/sql/machine-learning/troubleshooting/machine-learning-troubleshooting-overview",
4205142071
"redirect_document_id": true
4205242072
},
4205342073
{
@@ -42163,6 +42183,11 @@
4216342183
{
4216442184
"source_path": "docs/advanced-analytics/r/how-to-do-realtime-scoring.md",
4216542185
"redirect_url": "/sql/machine-learning/r/how-to-do-realtime-scoring",
42186+
"redirect_document_id": false
42187+
},
42188+
{
42189+
"source_path": "docs/machine-learning/r/how-to-do-realtime-scoring.md",
42190+
"redirect_url": "/sql/machine-learning/predictions/how-to-do-realtime-scoring",
4216642191
"redirect_document_id": true
4216742192
},
4216842193
{
@@ -42243,9 +42268,14 @@
4224342268
{
4224442269
"source_path": "docs/machine-learning/r/upgrade-and-installation-faq-sql-server-r-services.md",
4224542270
"redirect_url": "/sql/machine-learning/upgrade-and-installation-faq-sql-server-r-services",
42271+
"redirect_document_id": false
42272+
},
42273+
{
42274+
"source_path": "docs/machine-learning/upgrade-and-installation-faq-sql-server-r-services.md",
42275+
"redirect_url": "/sql/machine-learning/troubleshooting/upgrade-and-installation-faq-sql-server-r-services",
4224642276
"redirect_document_id": true
4224742277
},
42248-
{
42278+
{
4224942279
"source_path": "docs/advanced-analytics/r/using-data-from-olap-cubes-in-r.md",
4225042280
"redirect_url": "/sql/machine-learning/r/using-data-from-olap-cubes-in-r",
4225142281
"redirect_document_id": true
@@ -42258,11 +42288,21 @@
4225842288
{
4225942289
"source_path": "docs/advanced-analytics/r-script-execution-errors.md",
4226042290
"redirect_url": "/sql/machine-learning/r-script-execution-errors",
42291+
"redirect_document_id": false
42292+
},
42293+
{
42294+
"source_path": "docs/machine-learning/r-script-execution-errors.md",
42295+
"redirect_url": "/sql/machine-learning/troubleshooting/r-script-execution-errors",
4226142296
"redirect_document_id": true
4226242297
},
4226342298
{
4226442299
"source_path": "docs/advanced-analytics/real-time-scoring.md",
4226542300
"redirect_url": "/sql/machine-learning/real-time-scoring",
42301+
"redirect_document_id": false
42302+
},
42303+
{
42304+
"source_path": "docs/machine-learning/real-time-scoring.md",
42305+
"redirect_url": "/sql/machine-learning/predictions/real-time-scoring",
4226642306
"redirect_document_id": true
4226742307
},
4226842308
{

docs/connect/jdbc/using-bulk-copy-with-the-jdbc-driver.md

Lines changed: 21 additions & 25 deletions
Large diffs are not rendered by default.

docs/connect/odbc/cpp-code-example-app-connect-access-sql-db.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "C++ ODBC app accessing a SQL database"
33
description: "This C++ sample application demonstrates how to use the ODBC APIs to connect to and access a SQL database."
44
ms.custom: ""
5-
ms.date: "07/08/2019"
5+
ms.date: "06/19/2020"
66
ms.prod: sql
77
ms.prod_service: connectivity
88
ms.reviewer: ""

docs/connect/oledb/ole-db-data-source-objects/sessions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Sessions | Microsoft Docs"
2+
title: Sessions (OLE DB driver)
33
description: "Sessions in OLE DB Driver for SQL Server"
44
ms.custom: ""
55
ms.date: "06/14/2018"

docs/connect/oledb/ole-db-errors/retrieving-error-information.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Retrieving Error Information | Microsoft Docs"
2+
title: Retrieving error information (OLE DB driver)
33
description: "Retrieving error information using OLE DB Driver for SQL Server"
44
ms.custom: ""
55
ms.date: "06/14/2018"

docs/connect/oledb/ole-db-errors/return-codes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Return Codes | Microsoft Docs"
2+
title: Return codes (OLE DB driver)
33
description: "Return codes"
44
ms.custom: ""
55
ms.date: "06/14/2018"

docs/connect/oledb/ole-db-how-to/results/processing-results-how-to-topics-ole-db.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Processing Results How-to Topics (OLE DB) | Microsoft Docs"
2+
title: Processing results how-to topics (OLE DB driver)
33
description: "Processing results how-to topics (OLE DB)"
44
ms.custom: ""
55
ms.date: "06/14/2018"

docs/connect/oledb/ole-db-how-to/retrieve-rows-using-bookmarks-ole-db.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Retrieve Rows Using Bookmarks (OLE DB) | Microsoft Docs"
2+
title: Retrieve rows using bookmarks (OLE DB driver)
33
description: "Retrieve rows using bookmarks (OLE DB)"
44
ms.custom: ""
55
ms.date: "06/14/2018"

docs/connect/oledb/ole-db-how-to/set-large-data-ole-db.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Set Large Data (OLE DB) | Microsoft Docs"
2+
title: Set large data (OLE DB driver)
33
description: "Set large data (OLE DB)"
44
ms.custom: ""
55
ms.date: "06/14/2018"
@@ -46,7 +46,7 @@ ms.author: pelopes
4646
## Example
4747

4848
### Description
49-
Compile with ole32.lib oleaut32.lib and execute the following C++ code listing. This application connects to your computer's default [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] instance. On some Windows operating systems, you will need to change (localhost) or (local) to the name of your [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] instance. To connect to a named instance, change the connection string from L"(local)" to L"(local)\\\name" , where name is the named instance. By default, [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] Express installs to a named instance. Make sure your INCLUDE environment variable includes the directory that contains msoledbsql.h.
49+
Compile with ole32.lib oleaut32.lib and execute the following C++ code listing. This application connects to your computer's default [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] instance. On some Windows operating systems, you will need to change (localhost) or (local) to the name of your [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] instance. To connect to a named instance, change the connection string from L"(local)" to L"(local)\\\name", where name is the named instance. By default, [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] Express installs to a named instance. Make sure your INCLUDE environment variable includes the directory that contains msoledbsql.h.
5050

5151
### Code
5252

docs/connect/oledb/ole-db-rowsets/rowset-properties-and-behaviors.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Rowset Properties and Behaviors | Microsoft Docs"
2+
title: Rowset properties and behaviors (OLE DB driver)
33
description: "Rowset properties and behaviors in OLE DB Driver for SQL Server"
44
ms.custom: ""
55
ms.date: "06/14/2018"
@@ -31,7 +31,7 @@ ms.author: pelopes
3131
|DBPROP_BLOCKINGSTORAGEOBJECTS|R/W: Read-only<br /><br /> Default: VARIANT_TRUE<br /><br /> Description: The OLE DB Driver for SQL Server storage objects block using other rowset methods.|
3232
|DBPROP_BOOKMARKS DBPROP_LITERALBOOKMARKS|R/W: Read/write<br /><br /> Default: VARIANT_FALSE<br /><br /> Description: The OLE DB Driver for SQL Server supports bookmarks for rowset row identification when DBPROP_BOOKMARKS or DBPROP_LITERALBOOKMARKS is VARIANT_TRUE.<br /><br /> Setting either property to VARIANT_TRUE does not enable rowset positioning by bookmark. Set DBPROP_IRowsetLocate or DBPROP_IRowsetScroll to VARIANT_TRUE to create a rowset supporting rowset positioning by bookmark.<br /><br /> The OLE DB Driver for SQL Server uses a [!INCLUDE[msCoName](../../../includes/msconame-md.md)] [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] cursor to support a rowset that contains bookmarks. For more information, see [Rowsets and SQL Server Cursors](../../oledb/ole-db-rowsets/rowsets-and-sql-server-cursors.md).<br /><br /> Note: Setting these properties in conflict with other OLE DB Driver for SQL Server cursor-defining properties causes an error. For example, setting the DBPROP_BOOKMARKS to VARIANT_TRUE when DBPROP_OTHERINSERT is also VARIANT_TRUE generates an error when the consumer tries to open a rowset.|
3333
|DBPROP_BOOKMARKSKIPPED|R/W: Read-only<br /><br /> Default: VARIANT_FALSE<br /><br /> Description: The OLE DB Driver for SQL Server returns DB_E_BADBOOKMARK if the consumer indicates an invalid bookmark when positioning or searching a bookmarked rowset.|
34-
|DBPROP_BOOKMARKTYPE|R/W: Read-only<br /><br /> Default: DBPROPVAL_BMK_NUMERIC<br /><br /> Description: The OLE DB Driver for SQL Server implements numeric bookmarks only. A OLE DB Driver for SQL Server bookmark is 32-bit unsigned integer, type DBTYPE_UI4.|
34+
|DBPROP_BOOKMARKTYPE|R/W: Read-only<br /><br /> Default: DBPROPVAL_BMK_NUMERIC<br /><br /> Description: The OLE DB Driver for SQL Server implements numeric bookmarks only. An OLE DB Driver for SQL Server bookmark is 32-bit unsigned integer, type DBTYPE_UI4.|
3535
|DBPROP_CACHEDEFERRED|This rowset property is not implemented by the OLE DB Driver for SQL Server. Trying to read or write the property value generates an error.|
3636
|DBPROP_CANFETCHBACKWARDS DBPROP_CANSCROLLBACKWARDS|R/W: Read/write<br /><br /> Default: VARIANT_FALSE<br /><br /> Description: The OLE DB Driver for SQL Server supports backward fetching and scrolling in nonsequential rowsets. The OLE DB Driver for SQL Server creates a cursor-supported rowset when either DBPROP_CANFETCHBACKWARDS or DBPROP_CANSCROLLBACKWARDS is VARIANT_TRUE. For more information, see [Rowsets and SQL Server Cursors](../../oledb/ole-db-rowsets/rowsets-and-sql-server-cursors.md).|
3737
|DBPROP_CANHOLDROWS|R/W: Read/write<br /><br /> Default: VARIANT_FALSE<br /><br /> Description: By default, the OLE DB Driver for SQL Server returns DB_E_ROWSNOTRELEASED if the consumer tries to obtain more rows for a rowset while pending changes exist on those currently in the rowset. This behavior can be modified.<br /><br /> Setting both DBPROP_CANHOLDROWS and DBPROP_IRowsetChange to VARIANT_TRUE implies a bookmarked rowset. If both properties are VARIANT_TRUE, the **IRowsetLocate** interface is available on the rowset and DBPROP_BOOKMARKS and DBPROP_LITERALBOOKMARKS are both VARIANT_TRUE.<br /><br /> OLE DB Driver for SQL Server rowsets that contain bookmarks are supported by [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] cursors.|
@@ -74,7 +74,7 @@ ms.author: pelopes
7474
|DBPROP_REPORTMULTIPLECHANGES|This rowset property is not implemented by the OLE DB Driver for SQL Server. Trying to read or write the property value generates an error.|
7575
|DBPROP_RETURNPENDINGINSERTS|R/W: Read-only<br /><br /> Default: VARIANT_FALSE<br /><br /> Description: When a method that fetches rows is called, the OLE DB Driver for SQL Server does not return pending insert rows.|
7676
|DBPROP_ROWRESTRICT|R/W: Read-only<br /><br /> Default: VARIANT_TRUE<br /><br /> Description: OLE DB Driver for SQL Server rowsets do not support access rights based on the row. If the **IRowsetChange** interface is exposed on a rowset, the **SetData** method can be called by the consumer.|
77-
|DBPROP_ROWSET_ASYNCH|R/W: Read/write<br /><br /> Default: 0<br /><br /> Description: Provides for anychronous rowset processing. This property is in the Rowset property group and DBPROPSET_ROWSET property set. Type is VT_14.<br /><br /> The only value in the bitmask supported by OLE DB Driver for SQL Server is **DBPROPVAL_ASYNCH_INITIALIZE**.|
77+
|DBPROP_ROWSET_ASYNCH|R/W: Read/write<br /><br /> Default: 0<br /><br /> Description: Provides for asynchronous rowset processing. This property is in the Rowset property group and DBPROPSET_ROWSET property set. Type is VT_14.<br /><br /> The only value in the bitmask supported by OLE DB Driver for SQL Server is **DBPROPVAL_ASYNCH_INITIALIZE**.|
7878
|DBPROP_ROWTHREADMODEL|R/W: Read-only<br /><br /> Default: DBPROPVAL_RT_FREETHREAD<br /><br /> Description: The OLE DB Driver for SQL Server supports access to its objects from multiple execution threads of a single consumer.|
7979
|DBPROP_SERVERCURSOR|R/W: Read/write<br /><br /> Default: VARIANT_FALSE<br /><br /> Description: When set, a [!INCLUDE[ssNoVersion](../../../includes/ssnoversion-md.md)] cursor is used to support the rowset. For more information, see [Rowsets and SQL Server Cursors](../../oledb/ole-db-rowsets/rowsets-and-sql-server-cursors.md).|
8080
|DBPROP_SERVERDATAONINSERT|R/W: Read/write<br /><br /> Default: VARIANT_FALSE<br /><br /> Description: Server data on insert.<br /><br /> VARIANT_TRUE: At the time an insert is transmitted to the server, the provider retrieves data from the server to update the local row cache.<br /><br /> VARIANT_FALSE: The provider does not retrieve server values for newly inserted rows.|

0 commit comments

Comments
 (0)