Author: paul
Date: 2006-01-24 22:13:00 +0100 (Tue, 24 Jan 2006)
New Revision: 1023
Log:
r6648@frost: paul | 2006-01-24 11:25:57 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/database-administration.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.1/database-administration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6640
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2497
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6648
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2497
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-24 17:16:39 UTC (rev 1022)
+++ trunk/refman-4.1/database-administration.xml 2006-01-24 21:13:00 UTC (rev 1023)
@@ -19011,8 +19011,9 @@
If you change the character set when running MySQL, that may
also change the sort order. Consequently, you must run
<command>myisamchk -r -q
- --set-character-set=<replaceable>charset</replaceable></command>
+ --set-collation=<replaceable>charset</replaceable></command>
on all tables, or your indexes may not be ordered correctly.
+(Use <option>--set-character-set</option> before MySQL 4.1.1.)
</para>
<para>
@@ -19913,30 +19914,30 @@
</row>
<row>
<entry>The error log</entry>
- <entry>Logs problems encountered starting, running, or stopping
- <command>mysqld</command>.</entry>
+ <entry>Problems encountered starting, running, or stopping
+ <command>mysqld</command></entry>
</row>
<row>
<entry>The isam log</entry>
- <entry>Logs all changes to the <literal>ISAM</literal> tables. Used only for
- debugging the <literal>ISAM</literal> code.</entry>
+ <entry>All changes to the <literal>ISAM</literal> tables (used only for
+ debugging the <literal>ISAM</literal> code)</entry>
</row>
<row>
<entry>The query log</entry>
- <entry>Logs established client connections and executed statements.</entry>
+ <entry>Established client connections and executed statements</entry>
</row>
<row>
<entry>The update log</entry>
- <entry>Logs statements that change data. This log is deprecated.</entry>
+ <entry>All statements that change data (this log is deprecated)</entry>
</row>
<row>
<entry>The binary log</entry>
- <entry>Logs all statements that change data. Also used for replication.</entry>
+ <entry>All statements that change data (also used for replication)</entry>
</row>
<row>
<entry>The slow log</entry>
- <entry>Logs all queries that took more than <literal>long_query_time</literal>
- seconds to execute or did not use indexes.</entry>
+ <entry>All queries that took more than <literal>long_query_time</literal>
+ seconds to execute or didn't use indexes</entry>
</row>
</tbody>
</tgroup>
@@ -20601,10 +20602,11 @@
<para>
If you are using the update log or binary log, concurrent
- inserts are converted to normal inserts when using
+ inserts are converted to normal inserts for
<literal>CREATE ... SELECT</literal> or <literal>INSERT ...
- SELECT</literal>. This is to ensure that you can re-create an
- exact copy of your tables by applying the log on a backup.
+ SELECT</literal> statement. This is done to ensure that you can re-create an
+ exact copy of your tables by applying the log during a backup
+operation.
</para>
<para>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-24 17:16:39 UTC (rev 1022)
+++ trunk/refman-5.0/database-administration.xml 2006-01-24 21:13:00 UTC (rev 1023)
@@ -21245,7 +21245,7 @@
If you change the character set when running MySQL, that may
also change the sort order. Consequently, you must run
<command>myisamchk -r -q
- --set-character-set=<replaceable>charset</replaceable></command>
+ --set-collation=<replaceable>charset</replaceable></command>
on all tables, or your indexes may not be ordered correctly.
</para>
@@ -22085,25 +22085,21 @@
</row>
<row>
<entry>The error log</entry>
- <entry>Logs problems encountered starting, running, or stopping
- <command>mysqld</command>.</entry>
+ <entry>Problems encountered starting, running, or stopping
+ <command>mysqld</command></entry>
</row>
<row>
<entry>The query log</entry>
- <entry>Logs established client connections and executed statements.</entry>
+ <entry>Established client connections and executed statements</entry>
</row>
<row>
- <entry>The update log</entry>
- <entry>Logs statements that change data. This log is deprecated.</entry>
- </row>
- <row>
<entry>The binary log</entry>
- <entry>Logs all statements that change data. Also used for replication.</entry>
+ <entry>All statements that change data (also used for replication)</entry>
</row>
<row>
<entry>The slow log</entry>
- <entry>Logs all queries that took more than <literal>long_query_time</literal>
- seconds to execute or didn't use indexes.</entry>
+ <entry>All queries that took more than <literal>long_query_time</literal>
+ seconds to execute or didn't use indexes</entry>
</row>
</tbody>
</tgroup>
@@ -22668,11 +22664,12 @@
</para>
<para>
- If you are using the update log or binary log, concurrent
- inserts are converted to normal inserts when using
+ If you are using the binary log, concurrent
+ inserts are converted to normal inserts for
<literal>CREATE ... SELECT</literal> or <literal>INSERT ...
- SELECT</literal>. This is to ensure that you can re-create an
- exact copy of your tables by applying the log on a backup.
+ SELECT</literal> statement. This is done to ensure that you can re-create an
+ exact copy of your tables by applying the log during a backup
+operation.
</para>
<para>
@@ -22896,9 +22893,10 @@
<listitem>
<para>
- If update logging (<option>--log-update</option>) or binary
- logging (<option>--log-bin</option>) is used, closes the log
- and opens a new log file with a higher sequence number.
+ If binary
+ logging (<option>--log-bin</option>) is used, the server closes
+the current log file
+ and opens a new log file with the next sequence number.
</para>
</listitem>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-24 17:16:39 UTC (rev 1022)
+++ trunk/refman-5.1/database-administration.xml 2006-01-24 21:13:00 UTC (rev 1023)
@@ -21258,7 +21258,7 @@
If you change the character set when running MySQL, that may
also change the sort order. Consequently, you must run
<command>myisamchk -r -q
- --set-character-set=<replaceable>charset</replaceable></command>
+ --set-collation=<replaceable>charset</replaceable></command>
on all tables, or your indexes may not be ordered correctly.
</para>
@@ -22098,25 +22098,21 @@
</row>
<row>
<entry>The error log</entry>
- <entry>Logs problems encountered starting, running, or stopping
- <command>mysqld</command>.</entry>
+ <entry>Problems encountered starting, running, or stopping
+ <command>mysqld</command></entry>
</row>
<row>
<entry>The query log</entry>
- <entry>Logs established client connections and executed statements.</entry>
+ <entry>Established client connections and executed statements</entry>
</row>
<row>
- <entry>The update log</entry>
- <entry>Logs statements that change data. This log is deprecated.</entry>
- </row>
- <row>
<entry>The binary log</entry>
- <entry>Logs all statements that change data. Also used for replication.</entry>
+ <entry>All statements that change data (also used for replication)</entry>
</row>
<row>
<entry>The slow log</entry>
- <entry>Logs all queries that took more than <literal>long_query_time</literal>
- seconds to execute or didn't use indexes.</entry>
+ <entry>All queries that took more than <literal>long_query_time</literal>
+ seconds to execute or didn't use indexes</entry>
</row>
</tbody>
</tgroup>
@@ -22681,11 +22677,12 @@
</para>
<para>
- If you are using the update log or binary log, concurrent
- inserts are converted to normal inserts when using
+ If you are using the binary log, concurrent
+ inserts are converted to normal inserts for
<literal>CREATE ... SELECT</literal> or <literal>INSERT ...
- SELECT</literal>. This is to ensure that you can re-create an
- exact copy of your tables by applying the log on a backup.
+ SELECT</literal> statement. This is done to ensure that you can re-create an
+ exact copy of your tables by applying the log during a backup
+operation.
</para>
<para>
@@ -22909,9 +22906,10 @@
<listitem>
<para>
- If update logging (<option>--log-update</option>) or binary
- logging (<option>--log-bin</option>) is used, closes the log
- and opens a new log file with a higher sequence number.
+ If binary
+ logging (<option>--log-bin</option>) is used, the server closes
+the current log file
+ and opens a new log file with the next sequence number.
</para>
</listitem>
@@ -23347,9 +23345,9 @@
For the following instructions, assume that you want to run
the <command>mysqld-nt</command> server from two different
versions of MySQL that are installed at
- <filename>C:\mysql-4.1.8</filename> and
+ <filename>C:\mysql-5.0.19</filename> and
<filename>C:\mysql-¤t-version;</filename>, respectively.
- (This might be the case if you're running 4.1.8 as your
+ (This might be the case if you're running 5.0.19 as your
production server, but also want to conduct tests using
¤t-version;.)
</para>
@@ -23431,12 +23429,12 @@
<emphasis role="bold">Approach 1:</emphasis> Specify the
options for all services in one of the standard option
files. To do this, use a different service name for each
- server. Suppose that you want to run the 4.1.8
+ server. Suppose that you want to run the 5.0.19
<command>mysqld-nt</command> using the service name of
<literal>mysqld1</literal> and the ¤t-version;
<command>mysqld-nt</command> using the service name
<literal>mysqld2</literal>. In this case, you can use the
- <literal>[mysqld1]</literal> group for 4.1.8 and the
+ <literal>[mysqld1]</literal> group for 5.0.19 and the
<literal>[mysqld2]</literal> group for ¤t-version;.
For example, you can set up <filename>C:\my.cnf</filename>
like this:
@@ -23445,7 +23443,7 @@
<programlisting>
# options for mysqld1 service
[mysqld1]
-basedir = C:/mysql-4.1.8
+basedir = C:/mysql-5.0.19
port = 3307
enable-named-pipe
socket = mypipe1
@@ -23465,7 +23463,7 @@
</para>
<programlisting>
-C:\> <userinput>C:\mysql-4.1.8\bin\mysqld-nt --install mysqld1</userinput>
+C:\> <userinput>C:\mysql-5.0.19\bin\mysqld-nt --install mysqld1</userinput>
C:\> <userinput>C:\mysql-¤t-version;\bin\mysqld-nt --install mysqld2</userinput>
</programlisting>
@@ -23503,14 +23501,14 @@
</para>
<para>
- With this approach, to specify options for the 4.1.8
+ With this approach, to specify options for the 5.0.19
<command>mysqld-nt</command>, create a file
<filename>C:\my-opts1.cnf</filename> that looks like this:
</para>
<programlisting>
[mysqld]
-basedir = C:/mysql-4.1.8
+basedir = C:/mysql-5.0.19
port = 3307
enable-named-pipe
socket = mypipe1
@@ -23535,7 +23533,7 @@
</para>
<programlisting>
-C:\> <userinput>C:\mysql-4.1.8\bin\mysqld-nt --install mysqld1</userinput>
+C:\> <userinput>C:\mysql-5.0.19\bin\mysqld-nt --install mysqld1</userinput>
--defaults-file=C:\my-opts1.cnf
C:\> <userinput>C:\mysql-¤t-version;\bin\mysqld-nt --install mysqld2</userinput>
--defaults-file=C:\my-opts2.cnf
@@ -23582,7 +23580,7 @@
</para>
<para>
- Assume that an existing 4.1.8 server is configured for the
+ Assume that an existing 5.0.19 server is configured for the
default TCP/IP port number (3306) and Unix socket file
(<filename>/tmp/mysql.sock</filename>). To configure a new
¤t-version; server to have different operating parameters,
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1023 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 24 Jan |
