Author: paul
Date: 2008-08-29 19:53:59 +0200 (Fri, 29 Aug 2008)
New Revision: 11630
Log:
r33558@frost: paul | 2008-08-29 12:54:12 -0500
mysqlbinlog: General revisions
Modified:
trunk/dynamic-docs/command-optvars/mysqlbinlog.xml
trunk/refman-4.1/programs-admin-util.xml
trunk/refman-5.0/programs-admin-util-core.xml
trunk/refman-5.1/programs-admin-util-core.xml
trunk/refman-6.0/programs-admin-util-core.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:33557
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32819
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33558
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32819
Modified: trunk/dynamic-docs/command-optvars/mysqlbinlog.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlbinlog.xml 2008-08-29 17:53:52 UTC (rev 11629)
+++ trunk/dynamic-docs/command-optvars/mysqlbinlog.xml 2008-08-29 17:53:59 UTC (rev 11630)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1056 bytes
@@ -799,7 +799,7 @@
<shortdescription lang="en">
Stop reading the binary log at the first event having a timestamp
- equal or posterior to the datetime argument
+ equal to or greater than the datetime argument
</shortdescription>
<types>
@@ -826,7 +826,7 @@
<shortdescription lang="en">
Start reading the binary log at the first event having a position
- equal to the N argument
+ equal to or greater than the argument
</shortdescription>
<types>
@@ -855,7 +855,7 @@
<shortdescription lang="en">
Stop reading the binary log at the first event having a position
- equal or greater than the N argument
+ equal to or greater than the argument
</shortdescription>
<types>
Modified: trunk/refman-4.1/programs-admin-util.xml
===================================================================
--- trunk/refman-4.1/programs-admin-util.xml 2008-08-29 17:53:52 UTC (rev 11629)
+++ trunk/refman-4.1/programs-admin-util.xml 2008-08-29 17:53:59 UTC (rev 11630)
Changed blocks: 4, Lines Added: 36, Lines Deleted: 35; 5882 bytes
@@ -3600,16 +3600,17 @@
<title>Description</title>
<para>
- The server's binary log consists of files that contain
+ The server's binary log consists of files containing
<quote>events</quote> that describe modifications to database
- contents. The server writes binary log files in binary format.
- To display these files in text format, use the
+ contents. The server writes these files in binary format. To
+ display their contents in text format, use the
<command>mysqlbinlog</command> utility, which is available as of
MySQL 3.23.14. You can also use <command>mysqlbinlog</command>
- to display relay log files written by a slave server in a
- replication setup. Relay logs have the same format as binary log
- files. The binary log and relay log are discussed further in
- <xref linkend="binary-log"/>, and <xref linkend="slave-logs"/>.
+ to display the contents of relay log files written by a slave
+ server in a replication setup because relay logs have the same
+ format as binary logs. The binary log and relay log are
+ discussed further in <xref linkend="binary-log"/>, and
+ <xref linkend="slave-logs"/>.
</para>
<para>
@@ -3630,11 +3631,11 @@
</programlisting>
<para>
- The output includes all events contained in
+ The output includes events contained in
<filename>binlog.000003</filename>. Event information includes
- the statement executed, the time the statement took, the thread
- ID of the client that issued it, the timestamp when it was
- executed, and so forth.
+ the statement, the ID of the server on which it was executed,
+ the timestamp when the statement was executed, how much time it
+ took, and so forth.
</para>
<para>
@@ -4146,52 +4147,52 @@
</listitem>
<listitem>
- <para id="option_mysqlbinlog_stop-datetime">
+ <para id="option_mysqlbinlog_start-position">
<indexterm>
<primary>mysqlbinlog</primary>
- <secondary>stop-datetime option</secondary>
+ <secondary>start-position option</secondary>
</indexterm>
<indexterm>
- <primary>stop-datetime option</primary>
+ <primary>start-position option</primary>
<secondary>mysqlbinlog</secondary>
</indexterm>
- <option>--stop-datetime=<replaceable>datetime</replaceable></option>
+ <option>--start-position=<replaceable>N</replaceable></option>
</para>
<para>
- Stop reading the binary log at the first event having a
- timestamp equal or posterior to the
- <replaceable>datetime</replaceable> argument. This option is
- useful for point-in-time recovery. See the description of
- the <option>--start-datetime</option> option for information
- about the <replaceable>datetime</replaceable> value. This
- option is available as of MySQL 4.1.4.
+ Start reading the binary log at the first event having a
+ position equal to or greater than
+ <replaceable>N</replaceable>. This option applies to the
+ first log file named on the command line. Available as of
+ MySQL 4.1.4 (previously named <option>--position</option>).
</para>
</listitem>
<listitem>
- <para id="option_mysqlbinlog_start-position">
+ <para id="option_mysqlbinlog_stop-datetime">
<indexterm>
<primary>mysqlbinlog</primary>
- <secondary>start-position option</secondary>
+ <secondary>stop-datetime option</secondary>
</indexterm>
<indexterm>
- <primary>start-position option</primary>
+ <primary>stop-datetime option</primary>
<secondary>mysqlbinlog</secondary>
</indexterm>
- <option>--start-position=<replaceable>N</replaceable></option>
+ <option>--stop-datetime=<replaceable>datetime</replaceable></option>
</para>
<para>
- Start reading the binary log at the first event having a
- position equal to the <replaceable>N</replaceable> argument.
- This option applies to the first log file named on the
- command line. Available as of MySQL 4.1.4 (previously named
- <option>--position</option>).
+ Stop reading the binary log at the first event having a
+ timestamp equal to or later than the
+ <replaceable>datetime</replaceable> argument. This option is
+ useful for point-in-time recovery. See the description of
+ the <option>--start-datetime</option> option for information
+ about the <replaceable>datetime</replaceable> value. This
+ option is available as of MySQL 4.1.4.
</para>
</listitem>
@@ -4212,10 +4213,10 @@
<para>
Stop reading the binary log at the first event having a
- position equal or greater than the
- <replaceable>N</replaceable> argument. This option applies
- to the last log file named on the command line. Available as
- of MySQL 4.1.4.
+ position equal to or greater than
+ <replaceable>N</replaceable>. This option applies to the
+ last log file named on the command line. Available as of
+ MySQL 4.1.4.
</para>
</listitem>
Modified: trunk/refman-5.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.0/programs-admin-util-core.xml 2008-08-29 17:53:52 UTC (rev 11629)
+++ trunk/refman-5.0/programs-admin-util-core.xml 2008-08-29 17:53:59 UTC (rev 11630)
Changed blocks: 12, Lines Added: 46, Lines Deleted: 45; 8430 bytes
@@ -3620,16 +3620,16 @@
<title>Description</title>
<para>
- The server's binary log consists of files that contain
+ The server's binary log consists of files containing
<quote>events</quote> that describe modifications to database
- contents. The server writes binary log files in binary format.
- To display these files in text format, use the
+ contents. The server writes these files in binary format. To
+ display their contents in text format, use the
<command>mysqlbinlog</command> utility. You can also use
- <command>mysqlbinlog</command> to display relay log files
- written by a slave server in a replication setup. Relay logs
- have the same format as binary log files. The binary log and
- relay log are discussed further in <xref linkend="binary-log"/>,
- and <xref linkend="slave-logs"/>.
+ <command>mysqlbinlog</command> to display the contents of relay
+ log files written by a slave server in a replication setup
+ because relay logs have the same format as binary logs. The
+ binary log and relay log are discussed further in
+ <xref linkend="binary-log"/>, and <xref linkend="slave-logs"/>.
</para>
<para>
@@ -3650,11 +3650,11 @@
</programlisting>
<para>
- The output includes all events contained in
+ The output includes events contained in
<filename>binlog.000003</filename>. Event information includes
- the statement executed, the time the statement took, the thread
- ID of the client that issued it, the timestamp when it was
- executed, and so forth.
+ the statement, the ID of the server on which it was executed,
+ the timestamp when the statement was executed, how much time it
+ took, and so forth.
</para>
<para>
@@ -4187,50 +4187,50 @@
</listitem>
<listitem>
- <para id="option_mysqlbinlog_stop-datetime">
+ <para id="option_mysqlbinlog_start-position">
<indexterm>
<primary>mysqlbinlog</primary>
- <secondary>stop-datetime option</secondary>
+ <secondary>start-position option</secondary>
</indexterm>
<indexterm>
- <primary>stop-datetime option</primary>
+ <primary>start-position option</primary>
<secondary>mysqlbinlog</secondary>
</indexterm>
- <option>--stop-datetime=<replaceable>datetime</replaceable></option>
+ <option>--start-position=<replaceable>N</replaceable></option>
</para>
<para>
- Stop reading the binary log at the first event having a
- timestamp equal or posterior to the
- <replaceable>datetime</replaceable> argument. This option is
- useful for point-in-time recovery. See the description of
- the <option>--start-datetime</option> option for information
- about the <replaceable>datetime</replaceable> value.
+ Start reading the binary log at the first event having a
+ position equal to or greater than
+ <replaceable>N</replaceable>. This option applies to the
+ first log file named on the command line.
</para>
</listitem>
<listitem>
- <para id="option_mysqlbinlog_start-position">
+ <para id="option_mysqlbinlog_stop-datetime">
<indexterm>
<primary>mysqlbinlog</primary>
- <secondary>start-position option</secondary>
+ <secondary>stop-datetime option</secondary>
</indexterm>
<indexterm>
- <primary>start-position option</primary>
+ <primary>stop-datetime option</primary>
<secondary>mysqlbinlog</secondary>
</indexterm>
- <option>--start-position=<replaceable>N</replaceable></option>
+ <option>--stop-datetime=<replaceable>datetime</replaceable></option>
</para>
<para>
- Start reading the binary log at the first event having a
- position equal to the <replaceable>N</replaceable> argument.
- This option applies to the first log file named on the
- command line.
+ Stop reading the binary log at the first event having a
+ timestamp equal to or later than the
+ <replaceable>datetime</replaceable> argument. This option is
+ useful for point-in-time recovery. See the description of
+ the <option>--start-datetime</option> option for information
+ about the <replaceable>datetime</replaceable> value.
</para>
</listitem>
@@ -4251,9 +4251,9 @@
<para>
Stop reading the binary log at the first event having a
- position equal or greater than the
- <replaceable>N</replaceable> argument. This option applies
- to the last log file named on the command line.
+ position equal to or greater than
+ <replaceable>N</replaceable>. This option applies to the
+ last log file named on the command line.
</para>
</listitem>
@@ -4492,7 +4492,7 @@
<para>
The <option>--hexdump</option> option produces a hex dump of the
- log contents in <literal>#</literal>-format comments:
+ log contents:
</para>
<programlisting>
@@ -4500,7 +4500,9 @@
</programlisting>
<para>
- With the preceding command, the output might look like this:
+ The hex output consists of comment lines beginning with
+ <literal>#</literal>, so the output might look like this for the
+ preceding command:
</para>
<programlisting>
@@ -4522,7 +4524,7 @@
<para>
Hex dump output currently contains the following elements. This
- format might change in the future.
+ format is subject to change.
</para>
<itemizedlist>
@@ -4545,11 +4547,10 @@
<listitem>
<para>
- <literal>Type</literal>: The type of the log event. In the
- example shown, <literal>'0f'</literal> means that the
- example event is a
+ <literal>Type</literal>: The event type code. In the example
+ shown, <literal>'0f'</literal> indicates a
<literal>FORMAT_DESCRIPTION_EVENT</literal>. The following
- table lists the possible types.
+ table lists the possible type codes.
</para>
<informaltable>
@@ -4592,7 +4593,7 @@
<row>
<entry><literal>05</literal></entry>
<entry><literal>INTVAR_EVENT</literal></entry>
- <entry>Used mainly for <literal>AUTO_INCREMENT</literal> values and when the
+ <entry>Used for <literal>AUTO_INCREMENT</literal> values or when the
<function role="sql">LAST_INSERT_ID()</function>
function is used in the statement.</entry>
</row>
@@ -4632,7 +4633,7 @@
<entry><literal>0b</literal></entry>
<entry><literal>DELETE_FILE_EVENT</literal></entry>
<entry>Rollback of a <literal>LOAD DATA INFILE</literal> statement. The
- temporary file should be deleted on slave.</entry>
+ temporary file should be deleted on the slave.</entry>
</row>
<row>
<entry><literal>0c</literal></entry>
@@ -4700,7 +4701,7 @@
<listitem>
<para>
- <literal>Master ID</literal>: The server id of the master
+ <literal>Master ID</literal>: The server ID of the master
that created the event.
</para>
</listitem>
@@ -4713,8 +4714,8 @@
<listitem>
<para>
- <literal>Master Pos</literal>: The position of the event in
- the original master log file.
+ <literal>Master Pos</literal>: The position of the next
+ event in the original master log file.
</para>
</listitem>
Modified: trunk/refman-5.1/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.1/programs-admin-util-core.xml 2008-08-29 17:53:52 UTC (rev 11629)
+++ trunk/refman-5.1/programs-admin-util-core.xml 2008-08-29 17:53:59 UTC (rev 11630)
Changed blocks: 13, Lines Added: 56, Lines Deleted: 55; 11355 bytes
@@ -3617,16 +3617,16 @@
<title>Description</title>
<para>
- The server's binary log consists of files that contain
+ The server's binary log consists of files containing
<quote>events</quote> that describe modifications to database
- contents. The server writes binary log files in binary format.
- To display these files in text format, use the
+ contents. The server writes these files in binary format. To
+ display their contents in text format, use the
<command>mysqlbinlog</command> utility. You can also use
- <command>mysqlbinlog</command> to display relay log files
- written by a slave server in a replication setup. Relay logs
- have the same format as binary log files. The binary log and
- relay log are discussed further in <xref linkend="binary-log"/>,
- and <xref linkend="slave-logs"/>.
+ <command>mysqlbinlog</command> to display the contents of relay
+ log files written by a slave server in a replication setup
+ because relay logs have the same format as binary logs. The
+ binary log and relay log are discussed further in
+ <xref linkend="binary-log"/>, and <xref linkend="slave-logs"/>.
</para>
<para>
@@ -3647,11 +3647,11 @@
</programlisting>
<para>
- The output includes all events contained in
+ The output includes events contained in
<filename>binlog.000003</filename>. Event information includes
- the statement executed, the time the statement took, the thread
- ID of the client that issued it, the timestamp when it was
- executed, and so forth.
+ the statement, the ID of the server on which it was executed,
+ the timestamp when the statement was executed, how much time it
+ took, and so forth.
</para>
<para>
@@ -4351,50 +4351,50 @@
</listitem>
<listitem>
- <para id="option_mysqlbinlog_stop-datetime">
+ <para id="option_mysqlbinlog_start-position">
<indexterm>
<primary>mysqlbinlog</primary>
- <secondary>stop-datetime option</secondary>
+ <secondary>start-position option</secondary>
</indexterm>
<indexterm>
- <primary>stop-datetime option</primary>
+ <primary>start-position option</primary>
<secondary>mysqlbinlog</secondary>
</indexterm>
- <option>--stop-datetime=<replaceable>datetime</replaceable></option>
+ <option>--start-position=<replaceable>N</replaceable></option>
</para>
<para>
- Stop reading the binary log at the first event having a
- timestamp equal or posterior to the
- <replaceable>datetime</replaceable> argument. This option is
- useful for point-in-time recovery. See the description of
- the <option>--start-datetime</option> option for information
- about the <replaceable>datetime</replaceable> value.
+ Start reading the binary log at the first event having a
+ position equal to or greater than
+ <replaceable>N</replaceable>. This option applies to the
+ first log file named on the command line.
</para>
</listitem>
<listitem>
- <para id="option_mysqlbinlog_start-position">
+ <para id="option_mysqlbinlog_stop-datetime">
<indexterm>
<primary>mysqlbinlog</primary>
- <secondary>start-position option</secondary>
+ <secondary>stop-datetime option</secondary>
</indexterm>
<indexterm>
- <primary>start-position option</primary>
+ <primary>stop-datetime option</primary>
<secondary>mysqlbinlog</secondary>
</indexterm>
- <option>--start-position=<replaceable>N</replaceable></option>
+ <option>--stop-datetime=<replaceable>datetime</replaceable></option>
</para>
<para>
- Start reading the binary log at the first event having a
- position equal to the <replaceable>N</replaceable> argument.
- This option applies to the first log file named on the
- command line.
+ Stop reading the binary log at the first event having a
+ timestamp equal to or later than the
+ <replaceable>datetime</replaceable> argument. This option is
+ useful for point-in-time recovery. See the description of
+ the <option>--start-datetime</option> option for information
+ about the <replaceable>datetime</replaceable> value.
</para>
</listitem>
@@ -4415,9 +4415,9 @@
<para>
Stop reading the binary log at the first event having a
- position equal or greater than the
- <replaceable>N</replaceable> argument. This option applies
- to the last log file named on the command line.
+ position equal to or greater than
+ <replaceable>N</replaceable>. This option applies to the
+ last log file named on the command line.
</para>
</listitem>
@@ -4714,7 +4714,7 @@
<para>
The <option>--hexdump</option> option produces a hex dump of the
- log contents in <literal>#</literal>-format comments:
+ log contents:
</para>
<programlisting>
@@ -4722,7 +4722,9 @@
</programlisting>
<para>
- With the preceding command, the output might look like this:
+ The hex output consists of comment lines beginning with
+ <literal>#</literal>, so the output might look like this for the
+ preceding command:
</para>
<programlisting>
@@ -4744,7 +4746,7 @@
<para>
Hex dump output currently contains the following elements. This
- format might change in the future.
+ format is subject to change.
</para>
<itemizedlist>
@@ -4767,11 +4769,10 @@
<listitem>
<para>
- <literal>Type</literal>: The type of the log event. In the
- example shown, <literal>'0f'</literal> means that the
- example event is a
+ <literal>Type</literal>: The event type code. In the example
+ shown, <literal>'0f'</literal> indicates a
<literal>FORMAT_DESCRIPTION_EVENT</literal>. The following
- table lists the possible types.
+ table lists the possible type codes.
</para>
<informaltable>
@@ -4814,7 +4815,7 @@
<row>
<entry><literal>05</literal></entry>
<entry><literal>INTVAR_EVENT</literal></entry>
- <entry>Used mainly for <literal>AUTO_INCREMENT</literal> values and when the
+ <entry>Used for <literal>AUTO_INCREMENT</literal> values or when the
<function role="sql">LAST_INSERT_ID()</function>
function is used in the statement.</entry>
</row>
@@ -4854,7 +4855,7 @@
<entry><literal>0b</literal></entry>
<entry><literal>DELETE_FILE_EVENT</literal></entry>
<entry>Rollback of a <literal>LOAD DATA INFILE</literal> statement. The
- temporary file should be deleted on slave.</entry>
+ temporary file should be deleted on the slave.</entry>
</row>
<row>
<entry><literal>0c</literal></entry>
@@ -4898,42 +4899,42 @@
<row>
<entry><literal>13</literal></entry>
<entry><literal>TABLE_MAP_EVENT</literal></entry>
- <entry>Information about a table definition. Used in MySQL 5.1 and later.</entry>
+ <entry>Information about a table definition. Used in MySQL 5.1.5 and later.</entry>
</row>
<row>
<entry><literal>14</literal></entry>
<entry><literal>PRE_GA_WRITE_ROWS_EVENT</literal></entry>
- <entry>Row data for a single table that should be created. Used in MySQL 5.1.0
- to 5.1.15.</entry>
+ <entry>Row data for a single table that should be created. Used in MySQL 5.1.5
+ to 5.1.17.</entry>
</row>
<row>
<entry><literal>15</literal></entry>
<entry><literal>PRE_GA_UPDATE_ROWS_EVENT</literal></entry>
- <entry>Row data for a single table that needs to be updated. Used in MySQL 5.1
- to 5.1.15.</entry>
+ <entry>Row data for a single table that needs to be updated. Used in MySQL
+ 5.1.5 to 5.1.17.</entry>
</row>
<row>
<entry><literal>16</literal></entry>
<entry><literal>PRE_GA_DELETE_ROWS_EVENT</literal></entry>
- <entry>Row data for a single table that should be deleted. Used in MySQL 5.1 to
- 5.1.15.</entry>
+ <entry>Row data for a single table that should be deleted. Used in MySQL 5.1.5
+ to 5.1.17.</entry>
</row>
<row>
<entry><literal>17</literal></entry>
<entry><literal>WRITE_ROWS_EVENT</literal></entry>
- <entry>Row data for a single table that should be created. Used in MySQL 5.1.16
+ <entry>Row data for a single table that should be created. Used in MySQL 5.1.18
and later.</entry>
</row>
<row>
<entry><literal>18</literal></entry>
<entry><literal>UPDATE_ROWS_EVENT</literal></entry>
<entry>Row data for a single table that needs to be updated. Used in MySQL
- 5.1.16 and later.</entry>
+ 5.1.18 and later.</entry>
</row>
<row>
<entry><literal>19</literal></entry>
<entry><literal>DELETE_ROWS_EVENT</literal></entry>
- <entry>Row data for a single table that should be deleted. Used in MySQL 5.1.16
+ <entry>Row data for a single table that should be deleted. Used in MySQL 5.1.18
and later.</entry>
</row>
<row>
@@ -4948,7 +4949,7 @@
<listitem>
<para>
- <literal>Master ID</literal>: The server id of the master
+ <literal>Master ID</literal>: The server ID of the master
that created the event.
</para>
</listitem>
@@ -4961,8 +4962,8 @@
<listitem>
<para>
- <literal>Master Pos</literal>: The position of the event in
- the original master log file.
+ <literal>Master Pos</literal>: The position of the next
+ event in the original master log file.
</para>
</listitem>
Modified: trunk/refman-6.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-6.0/programs-admin-util-core.xml 2008-08-29 17:53:52 UTC (rev 11629)
+++ trunk/refman-6.0/programs-admin-util-core.xml 2008-08-29 17:53:59 UTC (rev 11630)
Changed blocks: 13, Lines Added: 56, Lines Deleted: 55; 11355 bytes
@@ -3617,16 +3617,16 @@
<title>Description</title>
<para>
- The server's binary log consists of files that contain
+ The server's binary log consists of files containing
<quote>events</quote> that describe modifications to database
- contents. The server writes binary log files in binary format.
- To display these files in text format, use the
+ contents. The server writes these files in binary format. To
+ display their contents in text format, use the
<command>mysqlbinlog</command> utility. You can also use
- <command>mysqlbinlog</command> to display relay log files
- written by a slave server in a replication setup. Relay logs
- have the same format as binary log files. The binary log and
- relay log are discussed further in <xref linkend="binary-log"/>,
- and <xref linkend="slave-logs"/>.
+ <command>mysqlbinlog</command> to display the contents of relay
+ log files written by a slave server in a replication setup
+ because relay logs have the same format as binary logs. The
+ binary log and relay log are discussed further in
+ <xref linkend="binary-log"/>, and <xref linkend="slave-logs"/>.
</para>
<para>
@@ -3647,11 +3647,11 @@
</programlisting>
<para>
- The output includes all events contained in
+ The output includes events contained in
<filename>binlog.000003</filename>. Event information includes
- the statement executed, the time the statement took, the thread
- ID of the client that issued it, the timestamp when it was
- executed, and so forth.
+ the statement, the ID of the server on which it was executed,
+ the timestamp when the statement was executed, how much time it
+ took, and so forth.
</para>
<para>
@@ -4348,50 +4348,50 @@
</listitem>
<listitem>
- <para id="option_mysqlbinlog_stop-datetime">
+ <para id="option_mysqlbinlog_start-position">
<indexterm>
<primary>mysqlbinlog</primary>
- <secondary>stop-datetime option</secondary>
+ <secondary>start-position option</secondary>
</indexterm>
<indexterm>
- <primary>stop-datetime option</primary>
+ <primary>start-position option</primary>
<secondary>mysqlbinlog</secondary>
</indexterm>
- <option>--stop-datetime=<replaceable>datetime</replaceable></option>
+ <option>--start-position=<replaceable>N</replaceable></option>
</para>
<para>
- Stop reading the binary log at the first event having a
- timestamp equal or posterior to the
- <replaceable>datetime</replaceable> argument. This option is
- useful for point-in-time recovery. See the description of
- the <option>--start-datetime</option> option for information
- about the <replaceable>datetime</replaceable> value.
+ Start reading the binary log at the first event having a
+ position equal to or greater than
+ <replaceable>N</replaceable>. This option applies to the
+ first log file named on the command line.
</para>
</listitem>
<listitem>
- <para id="option_mysqlbinlog_start-position">
+ <para id="option_mysqlbinlog_stop-datetime">
<indexterm>
<primary>mysqlbinlog</primary>
- <secondary>start-position option</secondary>
+ <secondary>stop-datetime option</secondary>
</indexterm>
<indexterm>
- <primary>start-position option</primary>
+ <primary>stop-datetime option</primary>
<secondary>mysqlbinlog</secondary>
</indexterm>
- <option>--start-position=<replaceable>N</replaceable></option>
+ <option>--stop-datetime=<replaceable>datetime</replaceable></option>
</para>
<para>
- Start reading the binary log at the first event having a
- position equal to the <replaceable>N</replaceable> argument.
- This option applies to the first log file named on the
- command line.
+ Stop reading the binary log at the first event having a
+ timestamp equal to or later than the
+ <replaceable>datetime</replaceable> argument. This option is
+ useful for point-in-time recovery. See the description of
+ the <option>--start-datetime</option> option for information
+ about the <replaceable>datetime</replaceable> value.
</para>
</listitem>
@@ -4412,9 +4412,9 @@
<para>
Stop reading the binary log at the first event having a
- position equal or greater than the
- <replaceable>N</replaceable> argument. This option applies
- to the last log file named on the command line.
+ position equal to or greater than
+ <replaceable>N</replaceable>. This option applies to the
+ last log file named on the command line.
</para>
</listitem>
@@ -4710,7 +4710,7 @@
<para>
The <option>--hexdump</option> option produces a hex dump of the
- log contents in <literal>#</literal>-format comments:
+ log contents:
</para>
<programlisting>
@@ -4718,7 +4718,9 @@
</programlisting>
<para>
- With the preceding command, the output might look like this:
+ The hex output consists of comment lines beginning with
+ <literal>#</literal>, so the output might look like this for the
+ preceding command:
</para>
<programlisting>
@@ -4740,7 +4742,7 @@
<para>
Hex dump output currently contains the following elements. This
- format might change in the future.
+ format is subject to change.
</para>
<itemizedlist>
@@ -4763,11 +4765,10 @@
<listitem>
<para>
- <literal>Type</literal>: The type of the log event. In the
- example shown, <literal>'0f'</literal> means that the
- example event is a
+ <literal>Type</literal>: The event type code. In the example
+ shown, <literal>'0f'</literal> indicates a
<literal>FORMAT_DESCRIPTION_EVENT</literal>. The following
- table lists the possible types.
+ table lists the possible type codes.
</para>
<informaltable>
@@ -4810,7 +4811,7 @@
<row>
<entry><literal>05</literal></entry>
<entry><literal>INTVAR_EVENT</literal></entry>
- <entry>Used mainly for <literal>AUTO_INCREMENT</literal> values and when the
+ <entry>Used for <literal>AUTO_INCREMENT</literal> values or when the
<function role="sql">LAST_INSERT_ID()</function>
function is used in the statement.</entry>
</row>
@@ -4850,7 +4851,7 @@
<entry><literal>0b</literal></entry>
<entry><literal>DELETE_FILE_EVENT</literal></entry>
<entry>Rollback of a <literal>LOAD DATA INFILE</literal> statement. The
- temporary file should be deleted on slave.</entry>
+ temporary file should be deleted on the slave.</entry>
</row>
<row>
<entry><literal>0c</literal></entry>
@@ -4894,42 +4895,42 @@
<row>
<entry><literal>13</literal></entry>
<entry><literal>TABLE_MAP_EVENT</literal></entry>
- <entry>Information about a table definition. Used in MySQL 5.1 and later.</entry>
+ <entry>Information about a table definition. Used in MySQL 5.1.5 and later.</entry>
</row>
<row>
<entry><literal>14</literal></entry>
<entry><literal>PRE_GA_WRITE_ROWS_EVENT</literal></entry>
- <entry>Row data for a single table that should be created. Used in MySQL 5.1.0
- to 5.1.15.</entry>
+ <entry>Row data for a single table that should be created. Used in MySQL 5.1.5
+ to 5.1.17.</entry>
</row>
<row>
<entry><literal>15</literal></entry>
<entry><literal>PRE_GA_UPDATE_ROWS_EVENT</literal></entry>
- <entry>Row data for a single table that needs to be updated. Used in MySQL 5.1
- to 5.1.15.</entry>
+ <entry>Row data for a single table that needs to be updated. Used in MySQL
+ 5.1.5 to 5.1.17.</entry>
</row>
<row>
<entry><literal>16</literal></entry>
<entry><literal>PRE_GA_DELETE_ROWS_EVENT</literal></entry>
- <entry>Row data for a single table that should be deleted. Used in MySQL 5.1 to
- 5.1.15.</entry>
+ <entry>Row data for a single table that should be deleted. Used in MySQL 5.1.5
+ to 5.1.17.</entry>
</row>
<row>
<entry><literal>17</literal></entry>
<entry><literal>WRITE_ROWS_EVENT</literal></entry>
- <entry>Row data for a single table that should be created. Used in MySQL 5.1.16
+ <entry>Row data for a single table that should be created. Used in MySQL 5.1.18
and later.</entry>
</row>
<row>
<entry><literal>18</literal></entry>
<entry><literal>UPDATE_ROWS_EVENT</literal></entry>
<entry>Row data for a single table that needs to be updated. Used in MySQL
- 5.1.16 and later.</entry>
+ 5.1.18 and later.</entry>
</row>
<row>
<entry><literal>19</literal></entry>
<entry><literal>DELETE_ROWS_EVENT</literal></entry>
- <entry>Row data for a single table that should be deleted. Used in MySQL 5.1.16
+ <entry>Row data for a single table that should be deleted. Used in MySQL 5.1.18
and later.</entry>
</row>
<row>
@@ -4949,7 +4950,7 @@
<listitem>
<para>
- <literal>Master ID</literal>: The server id of the master
+ <literal>Master ID</literal>: The server ID of the master
that created the event.
</para>
</listitem>
@@ -4962,8 +4963,8 @@
<listitem>
<para>
- <literal>Master Pos</literal>: The position of the event in
- the original master log file.
+ <literal>Master Pos</literal>: The position of the next
+ event in the original master log file.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11630 - in trunk: . dynamic-docs/command-optvars refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 29 Aug |
