Author: paul
Date: 2006-10-05 16:28:44 +0200 (Thu, 05 Oct 2006)
New Revision: 3548
Log:
r10467@frost: paul | 2006-10-05 09:24:16 -0500
Add further info to mysql_real_connect() section on meaning of host
parameter, per discussion with MikeL.
Modified:
trunk/refman-4.1/apis.xml
trunk/refman-5.0/apis.xml
trunk/refman-5.1/apis-c.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14253
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:10143
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10466
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14253
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:10467
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10466
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2006-10-05 02:17:07 UTC (rev 3547)
+++ trunk/refman-4.1/apis.xml 2006-10-05 14:28:44 UTC (rev 3548)
Changed blocks: 1, Lines Added: 13, Lines Deleted: 3; 1562 bytes
@@ -5975,9 +5975,19 @@
hostname or an IP address. If <literal>host</literal> is
<literal>NULL</literal> or the string
<literal>"localhost"</literal>, a connection to the local
- host is assumed. If the OS supports sockets (Unix) or
- named pipes (Windows), they are used instead of TCP/IP to
- connect to the server.
+ host is assumed. For Windows, the client connects using a
+ shared-memory connection, if the server has shared-memory
+ connections enabled. Otherwise, TCP/IP is used. For Unix,
+ the client connects using a Unix socket file. For local
+ connections, you can also influence the type of connection
+ to use with the <literal>MYSQL_OPT_PROTOCOL</literal> or
+ <literal>MYSQL_OPT_NAMED_PIPE</literal> options to
+ <literal>mysql_options()</literal>. The type of connection
+ must be supported by the server. For a
+ <literal>host</literal> value of <literal>"."</literal> on
+ Windows, the client connects using a named pipe, if the
+ server has named-pipe connections enabled. If named-pipe
+ connections are not enabled, an error occurs.
</para>
</listitem>
Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml 2006-10-05 02:17:07 UTC (rev 3547)
+++ trunk/refman-5.0/apis.xml 2006-10-05 14:28:44 UTC (rev 3548)
Changed blocks: 1, Lines Added: 13, Lines Deleted: 3; 1562 bytes
@@ -5555,9 +5555,19 @@
hostname or an IP address. If <literal>host</literal> is
<literal>NULL</literal> or the string
<literal>"localhost"</literal>, a connection to the local
- host is assumed. If the OS supports sockets (Unix) or
- named pipes (Windows), they are used instead of TCP/IP to
- connect to the server.
+ host is assumed. For Windows, the client connects using a
+ shared-memory connection, if the server has shared-memory
+ connections enabled. Otherwise, TCP/IP is used. For Unix,
+ the client connects using a Unix socket file. For local
+ connections, you can also influence the type of connection
+ to use with the <literal>MYSQL_OPT_PROTOCOL</literal> or
+ <literal>MYSQL_OPT_NAMED_PIPE</literal> options to
+ <literal>mysql_options()</literal>. The type of connection
+ must be supported by the server. For a
+ <literal>host</literal> value of <literal>"."</literal> on
+ Windows, the client connects using a named pipe, if the
+ server has named-pipe connections enabled. If named-pipe
+ connections are not enabled, an error occurs.
</para>
</listitem>
Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml 2006-10-05 02:17:07 UTC (rev 3547)
+++ trunk/refman-5.1/apis-c.xml 2006-10-05 14:28:44 UTC (rev 3548)
Changed blocks: 1, Lines Added: 13, Lines Deleted: 3; 1526 bytes
@@ -5360,9 +5360,19 @@
hostname or an IP address. If <literal>host</literal> is
<literal>NULL</literal> or the string
<literal>"localhost"</literal>, a connection to the local
- host is assumed. If the OS supports sockets (Unix) or named
- pipes (Windows), they are used instead of TCP/IP to connect
- to the server.
+ host is assumed: For Windows, the client connects using a
+ shared-memory connection, if the server has shared-memory
+ connections enabled. Otherwise, TCP/IP is used. For Unix,
+ the client connects using a Unix socket file. For local
+ connections, you can also influence the type of connection
+ to use with the <literal>MYSQL_OPT_PROTOCOL</literal> or
+ <literal>MYSQL_OPT_NAMED_PIPE</literal> options to
+ <literal>mysql_options()</literal>. The type of connection
+ must be supported by the server. For a
+ <literal>host</literal> value of <literal>"."</literal> on
+ Windows, the client connects using a named pipe, if the
+ server has named-pipe connections enabled. If named-pipe
+ connections are not enabled, an error occurs.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r3548 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 5 Oct |
