Author: paul
Date: 2008-07-09 19:50:22 +0200 (Wed, 09 Jul 2008)
New Revision: 11150
Log:
r32055@arctic: paul | 2008-07-09 12:39:53 -0500
Same as previous commit
Modified:
trunk/refman-4.1/programs-admin-util.xml
trunk/refman-4.1/programs-client.xml
trunk/refman-4.1/programs-using.xml
trunk/refman-5.0/programs-admin-util-core.xml
trunk/refman-5.0/programs-client-core.xml
trunk/refman-5.0/programs-using.xml
trunk/refman-5.1/programs-admin-util-core.xml
trunk/refman-5.1/programs-client-core.xml
trunk/refman-5.1/programs-using.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32399
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32050
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32399
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32055
Modified: trunk/refman-4.1/programs-admin-util.xml
===================================================================
--- trunk/refman-4.1/programs-admin-util.xml 2008-07-09 17:49:57 UTC (rev 11149)
+++ trunk/refman-4.1/programs-admin-util.xml 2008-07-09 17:50:22 UTC (rev 11150)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 546 bytes
@@ -3975,7 +3975,7 @@
<secondary>mysqlbinlog</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
Modified: trunk/refman-4.1/programs-client.xml
===================================================================
--- trunk/refman-4.1/programs-client.xml 2008-07-09 17:49:57 UTC (rev 11149)
+++ trunk/refman-4.1/programs-client.xml 2008-07-09 17:50:22 UTC (rev 11150)
Changed blocks: 6, Lines Added: 6, Lines Deleted: 6; 1865 bytes
@@ -869,7 +869,7 @@
<secondary>mysql</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -3793,7 +3793,7 @@
<secondary>mysqladmin</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -4758,7 +4758,7 @@
<secondary>mysqlcheck</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -6379,7 +6379,7 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -7598,7 +7598,7 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -8181,7 +8181,7 @@
<secondary>mysqlshow</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
Modified: trunk/refman-4.1/programs-using.xml
===================================================================
--- trunk/refman-4.1/programs-using.xml 2008-07-09 17:49:57 UTC (rev 11149)
+++ trunk/refman-4.1/programs-using.xml 2008-07-09 17:50:22 UTC (rev 11150)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 517 bytes
@@ -403,7 +403,7 @@
<primary>protocol option</primary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
Modified: trunk/refman-5.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.0/programs-admin-util-core.xml 2008-07-09 17:49:57 UTC (rev 11149)
+++ trunk/refman-5.0/programs-admin-util-core.xml 2008-07-09 17:50:22 UTC (rev 11150)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 561 bytes
@@ -4018,7 +4018,7 @@
<secondary>mysqlbinlog</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
Modified: trunk/refman-5.0/programs-client-core.xml
===================================================================
--- trunk/refman-5.0/programs-client-core.xml 2008-07-09 17:49:57 UTC (rev 11149)
+++ trunk/refman-5.0/programs-client-core.xml 2008-07-09 17:50:22 UTC (rev 11150)
Changed blocks: 6, Lines Added: 6, Lines Deleted: 6; 1880 bytes
@@ -905,7 +905,7 @@
<secondary>mysql</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -3957,7 +3957,7 @@
<secondary>mysqladmin</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -4945,7 +4945,7 @@
<secondary>mysqlcheck</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -6691,7 +6691,7 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -8126,7 +8126,7 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -8732,7 +8732,7 @@
<secondary>mysqlshow</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
Modified: trunk/refman-5.0/programs-using.xml
===================================================================
--- trunk/refman-5.0/programs-using.xml 2008-07-09 17:49:57 UTC (rev 11149)
+++ trunk/refman-5.0/programs-using.xml 2008-07-09 17:50:22 UTC (rev 11150)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 517 bytes
@@ -403,7 +403,7 @@
<primary>protocol option</primary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
Modified: trunk/refman-5.1/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.1/programs-admin-util-core.xml 2008-07-09 17:49:57 UTC (rev 11149)
+++ trunk/refman-5.1/programs-admin-util-core.xml 2008-07-09 17:50:22 UTC (rev 11150)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 561 bytes
@@ -4076,7 +4076,7 @@
<secondary>mysqlbinlog</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
Modified: trunk/refman-5.1/programs-client-core.xml
===================================================================
--- trunk/refman-5.1/programs-client-core.xml 2008-07-09 17:49:57 UTC (rev 11149)
+++ trunk/refman-5.1/programs-client-core.xml 2008-07-09 17:50:22 UTC (rev 11150)
Changed blocks: 7, Lines Added: 7, Lines Deleted: 7; 2149 bytes
@@ -954,7 +954,7 @@
<secondary>mysql</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -4075,7 +4075,7 @@
<secondary>mysqladmin</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -5146,7 +5146,7 @@
<secondary>mysqlcheck</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -6927,7 +6927,7 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -8417,7 +8417,7 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -9086,7 +9086,7 @@
<secondary>mysqlshow</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -10172,7 +10172,7 @@
<secondary>mysqlslap</secondary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
Modified: trunk/refman-5.1/programs-using.xml
===================================================================
--- trunk/refman-5.1/programs-using.xml 2008-07-09 17:49:57 UTC (rev 11149)
+++ trunk/refman-5.1/programs-using.xml 2008-07-09 17:50:22 UTC (rev 11150)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 517 bytes
@@ -403,7 +403,7 @@
<primary>protocol option</primary>
</indexterm>
- <option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11150 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 9 Jul |
