Author: shinz
Date: 2006-08-29 18:45:40 +0200 (Tue, 29 Aug 2006)
New Revision: 3121
Log:
Add description of SHOW SLAVE HOSTS output, fixing bug #21804; fix typo I introduced yesterday (sorry!)
Modified:
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/connector-net.xml
trunk/refman-5.1/sql-syntax.xml
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-08-29 16:34:55 UTC (rev 3120)
+++ trunk/refman-4.1/sql-syntax.xml 2006-08-29 16:45:40 UTC (rev 3121)
Changed blocks: 1, Lines Added: 74, Lines Deleted: 19; 3722 bytes
@@ -17969,40 +17969,95 @@
</section>
<section id="show-slave-hosts">
-
+
<title><literal>SHOW SLAVE HOSTS</literal> Syntax</title>
-
- <remark role="todo">
- describe output
- </remark>
-
+
<indexterm type="function">
<primary>SHOW SLAVE HOSTS</primary>
</indexterm>
-
+
<remark role="help-topic" condition="SHOW SLAVE HOSTS"/>
-
+
<remark role="help-keywords">
SHOW SLAVE HOSTS
</remark>
-
+
<remark role="help-syntax"/>
-
-<programlisting>
-SHOW SLAVE HOSTS
-</programlisting>
-
+
+ <programlisting>
+ SHOW SLAVE HOSTS
+ </programlisting>
+
<remark role="help-description-begin"/>
-
+
<para>
Displays a list of replication slaves currently registered
- with the master. Any slave not started with the
+ with the master. Only slaves started with the
<option>--report-host=<replaceable>slave_name</replaceable></option>
- option is not visible in this list.
+ option are visible in this list.
</para>
-
+
+ <para>
+ The list is displayed on any server (not just the master
+ server). The output looks like this:
+
+ <programlisting>
+ mysql> <userinput>SHOW SLAVE HOSTS</userinput>;
+ +------------+-----------+------+-----------+
+ | Server_id | Host | Port | Master_id |
+ +------------+-----------+------+-----------+
+ | 192168010 | iconnect2 | 3306 | 192168011 |
+ | 1921680101 | athena | 3306 | 192168011 |
+ +------------+-----------+------+-----------+
+ </programlisting>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <literal>Server_id</literal>: The unique server ID of
+ the slave server, as configured in the server's option
+ file, or on the command line with
+ <option>--server-id=<replaceable>value</replaceable>
+ </option>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Host</literal>: The host name of the slave
+ server, as configured in the server's option file, or on
+ the command line with
+ <option>--report-host=<replaceable>value</replaceable></option>.
+ Note that this can differ from the machine name as
+ configured in the operating system.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Port</literal>: The port the slave server is
+ listening on.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Master_id</literal>: The unique server ID of
+ the master server that the slave server is replicating
+ from.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ Some MySQL versions report another variable,
+ <literal>Rpl_recovery_rank</literal>. This variable was never
+ used, and was eventually removed.
+ </para>
+
<remark role="help-description-end"/>
-
+
</section>
</section>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-08-29 16:34:55 UTC (rev 3120)
+++ trunk/refman-5.0/sql-syntax.xml 2006-08-29 16:45:40 UTC (rev 3121)
Changed blocks: 1, Lines Added: 74, Lines Deleted: 19; 3722 bytes
@@ -20043,40 +20043,95 @@
</section>
<section id="show-slave-hosts">
-
+
<title><literal>SHOW SLAVE HOSTS</literal> Syntax</title>
-
- <remark role="todo">
- describe output
- </remark>
-
+
<indexterm type="function">
<primary>SHOW SLAVE HOSTS</primary>
</indexterm>
-
+
<remark role="help-topic" condition="SHOW SLAVE HOSTS"/>
-
+
<remark role="help-keywords">
SHOW SLAVE HOSTS
</remark>
-
+
<remark role="help-syntax"/>
-
-<programlisting>
-SHOW SLAVE HOSTS
-</programlisting>
-
+
+ <programlisting>
+ SHOW SLAVE HOSTS
+ </programlisting>
+
<remark role="help-description-begin"/>
-
+
<para>
Displays a list of replication slaves currently registered
- with the master. Any slave not started with the
+ with the master. Only slaves started with the
<option>--report-host=<replaceable>slave_name</replaceable></option>
- option is not visible in this list.
+ option are visible in this list.
</para>
-
+
+ <para>
+ The list is displayed on any server (not just the master
+ server). The output looks like this:
+
+ <programlisting>
+ mysql> <userinput>SHOW SLAVE HOSTS</userinput>;
+ +------------+-----------+------+-----------+
+ | Server_id | Host | Port | Master_id |
+ +------------+-----------+------+-----------+
+ | 192168010 | iconnect2 | 3306 | 192168011 |
+ | 1921680101 | athena | 3306 | 192168011 |
+ +------------+-----------+------+-----------+
+ </programlisting>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <literal>Server_id</literal>: The unique server ID of
+ the slave server, as configured in the server's option
+ file, or on the command line with
+ <option>--server-id=<replaceable>value</replaceable>
+ </option>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Host</literal>: The host name of the slave
+ server, as configured in the server's option file, or on
+ the command line with
+ <option>--report-host=<replaceable>value</replaceable></option>.
+ Note that this can differ from the machine name as
+ configured in the operating system.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Port</literal>: The port the slave server is
+ listening on.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Master_id</literal>: The unique server ID of
+ the master server that the slave server is replicating
+ from.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ Some MySQL versions report another variable,
+ <literal>Rpl_recovery_rank</literal>. This variable was never
+ used, and was eventually removed.
+ </para>
+
<remark role="help-description-end"/>
-
+
</section>
</section>
Modified: trunk/refman-5.1/connector-net.xml
===================================================================
--- trunk/refman-5.1/connector-net.xml 2006-08-29 16:34:55 UTC (rev 3120)
+++ trunk/refman-5.1/connector-net.xml 2006-08-29 16:45:40 UTC (rev 3121)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 677 bytes
@@ -4,8 +4,8 @@
[
<!ENTITY % fixedchars.entities SYSTEM "../refman-common/fixedchars.ent">
%fixedchars.entities;
- <!ENTITY % title.entities SYSTEM "../refman-common/urls.ent">
- %title.entities;
+ <!ENTITY % urls.entities SYSTEM "../refman-common/urls.ent">
+ %urls.entities;
<!ENTITY % versions.entities SYSTEM "versions.ent">
%versions.entities;
<!ENTITY connector_net "MySQL Connector/NET">
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-08-29 16:34:55 UTC (rev 3120)
+++ trunk/refman-5.1/sql-syntax.xml 2006-08-29 16:45:40 UTC (rev 3121)
Changed blocks: 4, Lines Added: 66, Lines Deleted: 11; 4333 bytes
@@ -891,9 +891,9 @@
... PARTITION BY</literal> statement must follow the same
rules as one created using <literal>CREATE TABLE ...
PARTITION BY</literal>. This includes the rules governing
- the relationship between any unique keys (including any primary
- key) that the table might have, and the column or columns
- used in the partitioning expression, as discussed in
+ the relationship between any unique keys (including any
+ primary key) that the table might have, and the column or
+ columns used in the partitioning expression, as discussed in
<link linkend="partitioning-limitations-partitioning-keys-unique-keys">Partitioning
Limitations: Partitioning Keys and Unique Keys</link>.
</para>
@@ -11273,8 +11273,8 @@
statement does not abort even if errors occur during the
update. Rows for which duplicate-key conflicts occur are not
updated. Rows for which columns are updated to values that
- would cause data conversion errors are updated to the closest
- valid values instead.
+ would cause data conversion errors are updated to the
+ closest valid values instead.
</para>
</listitem>
@@ -21566,10 +21566,6 @@
<title><literal>SHOW SLAVE HOSTS</literal> Syntax</title>
- <remark role="todo">
- describe output
- </remark>
-
<indexterm type="function">
<primary>SHOW SLAVE HOSTS</primary>
</indexterm>
@@ -21590,11 +21586,70 @@
<para>
Displays a list of replication slaves currently registered
- with the master. Any slave not started with the
+ with the master. Only slaves started with the
<option>--report-host=<replaceable>slave_name</replaceable></option>
- option is not visible in this list.
+ option are visible in this list.
</para>
+ <para>
+ The list is displayed on any server (not just the master
+ server). The output looks like this:
+
+<programlisting>
+mysql> <userinput>SHOW SLAVE HOSTS</userinput>;
++------------+-----------+------+-----------+
+| Server_id | Host | Port | Master_id |
++------------+-----------+------+-----------+
+| 192168010 | iconnect2 | 3306 | 192168011 |
+| 1921680101 | athena | 3306 | 192168011 |
++------------+-----------+------+-----------+
+</programlisting>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <literal>Server_id</literal>: The unique server ID of
+ the slave server, as configured in the server's option
+ file, or on the command line with
+ <option>--server-id=<replaceable>value</replaceable>
+ </option>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Host</literal>: The host name of the slave
+ server, as configured in the server's option file, or on
+ the command line with
+ <option>--report-host=<replaceable>value</replaceable></option>.
+ Note that this can differ from the machine name as
+ configured in the operating system.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Port</literal>: The port the slave server is
+ listening on.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>Master_id</literal>: The unique server ID of
+ the master server that the slave server is replicating
+ from.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ Some MySQL versions report another variable,
+ <literal>Rpl_recovery_rank</literal>. This variable was never
+ used, and was eventually removed.
+ </para>
+
<remark role="help-description-end"/>
</section>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r3121 - in trunk: refman-4.1 refman-5.0 refman-5.1 | stefan | 29 Aug |
