Skip to content

Commit ce01bf2

Browse files
committed
Merge remote-tracking branch 'origin/release/8.1' into trunk
2 parents 9d6c459 + 96e18f9 commit ce01bf2

File tree

6 files changed

+23
-24
lines changed

6 files changed

+23
-24
lines changed

doc/devapi_ref.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Connector/C++ 8.0 X DevAPI Reference {#devapi_ref}
1+
Connector/C++ 8 X DevAPI Reference {#devapi_ref}
22
====================================
33

4-
Connector/C++ 8.0 implements the X DevAPI, as described in
4+
Connector/C++ 8 implements the X DevAPI, as described in
55
the [X DevAPI User Guide]
66
(http://dev.mysql.com/doc/x-devapi-userguide/en/index.html).
77
The X DevAPI allows one to work with MySQL Servers implementing a document store
@@ -41,7 +41,7 @@ the X DevAPI is presented below. See also the [list of X DevAPI classes]
4141
The following Connector/C++ application connects to a MySQL Server with
4242
X Plugin, creates a document collection, adds a few documents to it, queries
4343
the collection and displays the result. The sample code can be found in file
44-
`testapp/devapi_test.cc` in the source distribution of Connector/C++ 8.0.
44+
`testapp/devapi_test.cc` in the source distribution of Connector/C++ 8.
4545
See @ref usage for instructions on how to build the sample code.
4646

4747
@dontinclude devapi_test.cc

doc/index.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ MySQL Connector/C++ Documentation {#mainpage}
22
=================================
33

44
MySQL Connector/C++ is a library for applications written in C or C++ that
5-
communicate with MySQL database servers. Version 8.0 of Connector/C++
5+
communicate with MySQL database servers. Version 8 of Connector/C++
66
implements three different APIs which can be used by applications:
77

88
- The new [X DevAPI](@ref devapi_ref) for applications written in C++.
@@ -11,14 +11,14 @@ implements three different APIs which can be used by applications:
1111
also implemented in version 1.1 of the connector.
1212

1313
The new APIs give access to MySQL implementing a
14-
[document store](https://dev.mysql.com/doc/refman/8.0/en/document-store.html).
14+
[document store](https://dev.mysql.com/doc/refman/en/document-store.html).
1515
Internally these APIs use the new X Protocol to communicate with the MySQL
1616
Server. Consequently, code written against these APIs can work only with MySQL
1717
Server 8 with the X Plugin enabled in it. Apart from accessing the document
1818
store, the new APIs allow executing traditional SQL queries as well.
1919

2020
Applications written against the JDBC4 based API of Connector/C++ 1.1 can be also
21-
compiled with Connector/C++ 8.0 which is backward compatible with the earlier
21+
compiled with Connector/C++ 8 which is backward compatible with the earlier
2222
version. Such code does not require the X Plugin and can communicate with older
2323
versions of the MySQL Server using the legacy protocol.
2424

@@ -33,7 +33,7 @@ More information:
3333
- [Indexing Document Collections](@ref indexing)
3434

3535
See also our
36-
[online documentation](https://dev.mysql.com/doc/connector-cpp/8.0/en/)
36+
[online documentation](https://dev.mysql.com/doc/connector-cpp/en/)
3737

3838
<!--
3939
Copyright (c) 2015, 2022, Oracle and/or its affiliates.

doc/indexing.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,22 @@ If the index type is not specified, or is set to "INDEX" then a plain index
6161
is created as by SQL command "CREATE INDEX ...". If the index type is set
6262
to "SPATIAL" then the created index is like one created by SQL command
6363
"CREATE SPATIAL INDEX ...", see
64-
https://dev.mysql.com/doc/refman/8.0/en/spatial-index-optimization.html
64+
https://dev.mysql.com/doc/refman/en/spatial-index-optimization.html
6565
and
66-
https://dev.mysql.com/doc/refman/8.0/en/creating-spatial-indexes.html.
66+
https://dev.mysql.com/doc/refman/en/creating-spatial-indexes.html.
6767
In this case it is not allowed to set the "required" field to false in field
6868
descriptions.
6969

7070
Values of indexed fields are converted from JSON to the type specified
7171
in the index field description using standard MySQL type conversions (see
72-
https://dev.mysql.com/doc/refman/8.0/en/type-conversion.html). Note that
72+
https://dev.mysql.com/doc/refman/en/type-conversion.html). Note that
7373
this means that, for example, when using a numeric type in an index field
7474
description and the actual field value is non-numeric, it will be usually
7575
converted to 0.
7676

7777
For index fields with GEOJSON type MySQL function ST_GeomFromGeoJSON() is used
7878
for conversion (see
79-
https://dev.mysql.com/doc/refman/8.0/en/spatial-geojson-functions.html#function_st-geomfromgeojson).
79+
https://dev.mysql.com/doc/refman/en/spatial-geojson-functions.html#function_st-geomfromgeojson).
8080
In this case, the "options" and "srid" fields might be present in the field
8181
description and if this is the case they are used as parameters for
8282
ST_GeomFromGeoJSON() during conversion.

doc/jdbc_ref.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
Connector/C++ 8.0 legacy C++ API based on JDBC4 {#jdbc_ref}
1+
Connector/C++ 8 legacy C++ API based on JDBC4 {#jdbc_ref}
22
=======================================
33

4-
Connector/C++ 8.0 supports the legacy C++ API based on the JDBC4 specification.
4+
Connector/C++ 8 supports the legacy C++ API based on the JDBC4 specification.
55

6-
This allows an easy migration to Connector/C++ version 8.0 for applications
6+
This allows an easy migration to Connector/C++ version 8.x for applications
77
that use Connector/C++ version 1.1.
88

99
More detailed information about the legacy C++ API can be found in the
10-
[X MySQL Connector/C++ Developer Guide]
11-
(https://dev.mysql.com/doc/connector-cpp/en/)
10+
[MySQL Connector/C++ 1.1 Developer Guide](https://dev.mysql.com/doc/connector-cpp/1.1/en/)
1211
of MySQL online manual.
1312

1413

@@ -23,7 +22,7 @@ legacy C++ API.
2322

2423
After the connection is established the code executes a simple SQL statement
2524
and reads the result from the server. The source file can be found in
26-
testapp/jdbc_test.cc in the source distribution of Connector/C++ 8.0.
25+
testapp/jdbc_test.cc in the source distribution of Connector/C++ 8.
2726
See @ref usage for instructions on how to build the sample code.
2827

2928
Each program which uses the legacy C++ API has to include this header:

doc/usage.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Using Connector/C++ 8.0 {#usage}
1+
Using Connector/C++ 8 {#usage}
22
=======================
33

4-
Connector/C++ 8.0 implements new APIs for accessing document store of
4+
Connector/C++ 8 implements new APIs for accessing document store of
55
MySQL Server 8: X DevAPI for applications written in C++11 and X DevAPI for C
66
for applications written in plain C. The same APIs can be also used to execute
7-
traditional SQL queries. Connector/C++ 8.0 also implements the legacy C++ API
7+
traditional SQL queries. Connector/C++ 8 also implements the legacy C++ API
88
based on JDBC4 which is backward compatible with version 1.1 of the connector.
99

1010
The choice of the API is done by including appropriate public headers.
@@ -53,7 +53,7 @@ Depending on the platform, the shared Connector/C++ library is named:
5353
- `mysqlcppconn8-1-vsXX.dll` on Windows platforms
5454
(with import library vsXX/mysqlcppconn8.lib)
5555

56-
This library implements the new X DevAPI and X DevAPI for C. Connector/C++ 8.0
56+
This library implements the new X DevAPI and X DevAPI for C. Connector/C++ 8
5757
also includes the legacy connector library `libmsysqlcppconn(.so/.dylib/.dll)`
5858
which implements the legacy JDBC4 API.
5959

@@ -243,7 +243,7 @@ target computer on which the application will run.
243243

244244
For more information on building code that uses Connector/C++ consult our
245245
[online documentation]
246-
(https://dev.mysql.com/doc/connector-cpp/8.0/en/connector-cpp-apps.html).
246+
(https://dev.mysql.com/doc/connector-cpp/en/connector-cpp-apps.html).
247247

248248

249249
<!--

doc/xapi_ref.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Connector/C++ 8.0 X DevAPI for C Reference {#xapi_ref}
1+
Connector/C++ 8 X DevAPI for C Reference {#xapi_ref}
22
================================
33

44
Connector/C++ implements a variant of X DevAPI that can be used by applications
@@ -93,7 +93,7 @@ ways such as plain SQL with parameters and table INSERT statements. Next,
9393
the code reads the table rows and displays the result.
9494

9595
The sample code can be found in file `testapp/xapi_test.cc` in the source
96-
distribution of Connector/C++ 8.0. See @ref usage for instructions on how
96+
distribution of Connector/C++ 8. See @ref usage for instructions on how
9797
to build the sample code.
9898

9999
@dontinclude xapi_test.c

0 commit comments

Comments
 (0)