Skip to content

Commit 7f875c7

Browse files
committed
WL#10077 (IPv6 support) Documentation.
1 parent 5543cf4 commit 7f875c7

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

include/mysql_devapi.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,8 @@ class PUBLIC_API SessionSettings
926926
enum Options
927927
{
928928
URI, //!< connection URI or string
929-
HOST, //!< host name or IP address
929+
//! DNS name of the host, IPv4 address or IPv6 address
930+
HOST,
930931
PORT, //!< X Plugin port to connect to
931932
USER, //!< user name
932933
PWD, //!< password
@@ -952,8 +953,11 @@ class PUBLIC_API SessionSettings
952953
Create a session using connection string or URL.
953954
954955
Connection sting has the form `"user:pass\@host:port/?option&option"`,
955-
valid URL is like a connection string with a `mysqlx://` prefix. Possible
956-
connection options are:
956+
valid URL is like a connection string with a `mysqlx://` prefix. Host is
957+
specified as either DNS name, IPv4 address of the form "nn.nn.nn.nn" or
958+
IPv6 address of the form "[nn:nn:nn:...]".
959+
960+
Possible connection options are:
957961
958962
- `ssl-enable` : use TLS connection
959963
- `ssl-ca=`<path> : path to a PEM file specifying trusted root certificates

include/mysql_xapi.h

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,8 @@ typedef enum mysqlx_sort_direction_enum
337337
typedef enum mysqlx_opt_type_enum
338338
{
339339
MYSQLX_OPT_HOST = 1, /**< host name or IP address */
340-
MYSQLX_OPT_PORT = 2, /**< X Plugin port to connect to */
340+
/** DNS name of the host, IPv4 address or IPv6 address */
341+
MYSQLX_OPT_PORT = 2,
341342
MYSQLX_OPT_USER = 3, /**< user name */
342343
MYSQLX_OPT_PWD = 4, /**< password */
343344
MYSQLX_OPT_DB = 5, /**< default database */
@@ -397,7 +398,7 @@ typedef enum mysqlx_view_check_option_enum
397398
/**
398399
Create a new session.
399400
400-
@param host server host address
401+
@param host server host DNS name, IPv4 address or IPv6 address
401402
@param port port number
402403
@param user user name
403404
@param password password
@@ -429,8 +430,11 @@ mysqlx_get_session(const char *host, int port, const char *user,
429430
Create a session using connection string or URL.
430431
431432
Connection sting has the form `"user:pass\@host:port/?option&option"`,
432-
valid URL is like a connection string with a `mysqlx://` prefix. Possible
433-
connection options are:
433+
valid URL is like a connection string with a `mysqlx://` prefix. Host is
434+
specified as either DNS name, IPv4 address of the form "nn.nn.nn.nn" or
435+
IPv6 address of the form "[nn:nn:nn:...]".
436+
437+
Possible connection options are:
434438
435439
- `ssl-enable` : use TLS connection
436440
- `ssl-ca=`<path> : path to a PEM file specifying trusted root certificates
@@ -489,7 +493,7 @@ mysqlx_get_session_from_options(mysqlx_session_options_t *opt,
489493
490494
A node session connects only to one mysqld node at a time.
491495
492-
@param host server host address
496+
@param host server host DNS name, IPv4 address or IPv6 address
493497
@param port port number
494498
@param user user name
495499
@param password password
@@ -520,8 +524,8 @@ mysqlx_get_node_session(const char *host, int port, const char *user,
520524
/**
521525
Create a node session using connection string or URL.
522526
523-
Connection sting has the form `"user:pass\@host:port"`, valid URL
524-
is like a connection string with `mysqlx://` prefix.
527+
See `mysqlx_get_session_from_url()` for information on connection string
528+
format.
525529
526530
A node session connects only to one mysqld node at a time.
527531
@@ -540,6 +544,8 @@ mysqlx_get_node_session(const char *host, int port, const char *user,
540544
541545
@note This type of session supports executing plain SQL queries
542546
547+
@see `mysqlx_get_session_from_url()`
548+
543549
@ingroup xapi_sess
544550
*/
545551

0 commit comments

Comments
 (0)