Author: paul
Date: 2006-01-30 21:35:42 +0100 (Mon, 30 Jan 2006)
New Revision: 1135
Log:
r2700@kite-hub: paul | 2006-01-30 13:03:51 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/installing.xml
trunk/refman-4.1/porting.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.0/porting.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/porting.xml
trunk/refman-5.1/replication.xml
trunk/tools/xmlformat.conf
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6940
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2698
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6940
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2700
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-01-30 18:36:44 UTC (rev 1134)
+++ trunk/refman-4.1/installing.xml 2006-01-30 20:35:42 UTC (rev 1135)
@@ -2863,7 +2863,8 @@
</itemizedlist>
<para>
- You may also have the following optional requirements:
+ There may also be other requirements, depending on how you plan
+ to use MySQL:
</para>
<itemizedlist>
@@ -2871,7 +2872,7 @@
<listitem>
<para>
If you plan to connect to the MySQL server via ODBC, you
- also need a Connector/ODBC driver. See
+ need a Connector/ODBC driver. See
<xref linkend="odbc-connector"/>.
</para>
</listitem>
@@ -2974,11 +2975,11 @@
<para>
The MySQL Installation Wizard and MySQL Configuration Wizard are
- available in the Essentials and Complete install packages, and
+ available in the Essentials and Complete install packages. They
are recommended for most standard MySQL installations.
Exceptions include users who need to install multiple instances
- of MySQL on a single server and advanced users who want complete
- control of server configuration.
+ of MySQL on a single server host and advanced users who want
+ complete control of server configuration.
</para>
<para>
@@ -3049,9 +3050,9 @@
Improving the MySQL Installation Wizard depends on the support
and feedback of users like you. If you find that the MySQL
Installation Wizard is lacking some feature important to you,
- or if you discover a bug, please use our
- <ulink url="http://bugs.mysql.com">MySQL Bug System</ulink> to
- request features or report problems.
+ or if you discover a bug, please report it in our bugs
+ database using the instructions given in
+ <xref linkend="bug-reports"/>.
</para>
<remark>
@@ -3065,7 +3066,7 @@
<title>&title-mysql-install-wizard-starting;</title>
<para>
- The MySQL server install packages can be downloaded from
+ The MySQL installation packages can be downloaded from
<ulink url="&base-url-downloads;"/>. If the package you
download is contained within a Zip archive, you need to
extract the archive first.
@@ -3144,21 +3145,17 @@
<para>
If you wish to change the installation path or the specific
components that are installed by the MySQL Installation
- Wizard, you should choose the <literal>Custom</literal>
+ Wizard, choose the <emphasis role="bold">Custom</emphasis>
installation type.
</para>
<para>
- All available components are listed in a tree view on the left
- side of the custom install dialog. Components that are not
- installed have a red
-
- <guiicon>X</guiicon>
-
- icon, components that are installed have a gray icon. To
- change whether a component is installed, click on the
- component's icon and choose an new option from the drop-down
- list that appears.
+ A tree view on the left side of the custom install dialog
+ lists all available components. Components that are not
+ installed have a red <guiicon>X</guiicon> icon, components
+ that are installed have a gray icon. To change whether a
+ component is installed, click on the component's icon and
+ choose an new option from the drop-down list that appears.
</para>
<para>
@@ -3441,12 +3438,12 @@
</para>
<para>
- MySQL Configuration Wizard is to a large extent the result of
- feedback MySQL AB has received from many users over a period
- of several years. However, if you find it is lacking some
- feature important to you, or if you discover a bug, please use
- our <ulink url="http://bugs.mysql.com">MySQL Bug
- System</ulink> to request features or report problems.
+ The MySQL Configuration Wizard is to a large extent the result
+ of feedback MySQL AB has received from many users over a
+ period of several years. However, if you find that it lacks
+ some feature important to you, please report it in our bugs
+ database using the instructions given in
+ <xref linkend="bug-reports"/>.
</para>
<remark>
@@ -8489,10 +8486,11 @@
<para>
If you have gotten to the <command>make</command> stage and
the distribution does not compile, please report it in our
- bugs database at <ulink url="http://bugs.mysql.com/"/>. If
- you have installed the latest versions of the required GNU
- tools, and they crash trying to process our configuration
- files, please report that also. However, if you execute
+ bugs database using the instructions given in
+ <xref linkend="bug-reports"/>. If you have installed the
+ latest versions of the required GNU tools, and they crash
+ trying to process our configuration files, please report
+ that also. However, if you execute
<command>aclocal</command> and get a <literal>command not
found</literal> error or a similar problem, do not report
it. Instead, make sure that all the necessary tools are
Modified: trunk/refman-4.1/porting.xml
===================================================================
--- trunk/refman-4.1/porting.xml 2006-01-30 18:36:44 UTC (rev 1134)
+++ trunk/refman-4.1/porting.xml 2006-01-30 20:35:42 UTC (rev 1135)
@@ -826,8 +826,8 @@
have found reproducible bug that should be easy to fix! FTP
the tables and the binary log to
<ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> and
- enter it into our bugs system at
- <ulink url="http://bugs.mysql.com/"/>. (Please note that the
+ report it in our bugs database using the instructions given
+ in <xref linkend="bug-reports"/>. (Please note that the
<filename>/pub/mysql/upload/</filename> FTP directory is not
listable, so you'll not see what you've uploaded in your FTP
client.) If you are a support customer, you can use the
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-30 18:36:44 UTC (rev 1134)
+++ trunk/refman-5.0/installing.xml 2006-01-30 20:35:42 UTC (rev 1135)
@@ -2853,7 +2853,8 @@
</itemizedlist>
<para>
- You may also have the following optional requirements:
+ There may also be other requirements, depending on how you plan
+ to use MySQL:
</para>
<itemizedlist>
@@ -2861,7 +2862,7 @@
<listitem>
<para>
If you plan to connect to the MySQL server via ODBC, you
- also need a Connector/ODBC driver. See
+ need a Connector/ODBC driver. See
<xref linkend="odbc-connector"/>.
</para>
</listitem>
@@ -2958,11 +2959,11 @@
<para>
The MySQL Installation Wizard and MySQL Configuration Wizard are
- available in the Essentials and Complete install packages, and
+ available in the Essentials and Complete install packages. They
are recommended for most standard MySQL installations.
Exceptions include users who need to install multiple instances
- of MySQL on a single server and advanced users who want complete
- control of server configuration.
+ of MySQL on a single server host and advanced users who want
+ complete control of server configuration.
</para>
</section>
@@ -2986,10 +2987,10 @@
<para>
The MySQL Installation Wizard is the standard installer for
- all MySQL ¤t-series; server distributions. Users of
- previous versions of MySQL need to shut down and remove their
- existing MySQL installations manually before installing MySQL
- with the MySQL Installation Wizard. See
+ all MySQL server distributions, version 4.1.5 and higher.
+ Users of previous versions of MySQL need to shut down and
+ remove their existing MySQL installations manually before
+ installing MySQL with the MySQL Installation Wizard. See
<xref linkend="mysql-install-wizard-upgrading"/>, for more
information on upgrading from a previous version.
</para>
@@ -3026,9 +3027,9 @@
Improving the MySQL Installation Wizard depends on the support
and feedback of users like you. If you find that the MySQL
Installation Wizard is lacking some feature important to you,
- or if you discover a bug, please use our
- <ulink url="http://bugs.mysql.com">MySQL Bug System</ulink> to
- request features or report problems.
+ or if you discover a bug, please report it in our bugs
+ database using the instructions given in
+ <xref linkend="bug-reports"/>.
</para>
<remark>
@@ -3099,7 +3100,7 @@
<title>&title-mysql-install-wizard-starting;</title>
<para>
- The MySQL server installation packages can be downloaded from
+ The MySQL installation packages can be downloaded from
<ulink url="&base-url-downloads;"/>. If the package you
download is contained within a Zip archive, you need to
extract the archive first.
@@ -3181,21 +3182,17 @@
<para>
If you wish to change the installation path or the specific
components that are installed by the MySQL Installation
- Wizard, you should choose the
- <emphasis role="bold">Custom</emphasis> installation type.
+ Wizard, choose the <emphasis role="bold">Custom</emphasis>
+ installation type.
</para>
<para>
- All available components are listed in a tree view on the left
- side of the custom install dialog. Components that are not
- installed have a red
-
- <guiicon>X</guiicon>
-
- icon; components that are installed have a gray icon. To
- change whether a component is installed, click on that
- component's icon and choose a new option from the drop-down
- list that appears.
+ A tree view on the left side of the custom install dialog
+ lists all available components. Components that are not
+ installed have a red <guiicon>X</guiicon> icon; components
+ that are installed have a gray icon. To change whether a
+ component is installed, click on that component's icon and
+ choose a new option from the drop-down list that appears.
</para>
<para>
@@ -3475,9 +3472,9 @@
The MySQL Configuration Wizard is to a large extent the result
of feedback MySQL AB has received from many users over a
period of several years. However, if you find that it lacks
- some feature important to you, or if you discover a bug,
- please use our <ulink url="http://bugs.mysql.com">MySQL Bug
- System</ulink> to request features or report problems.
+ some feature important to you, please report it in our bugs
+ database using the instructions given in
+ <xref linkend="bug-reports"/>.
</para>
<remark>
@@ -4809,12 +4806,9 @@
<listitem>
<para>
- On the Windows desktop, right-click on the
-
- <guiicon>My
- Computer</guiicon>
-
- icon, and select <guimenuitem>Properties</guimenuitem>
+ On the Windows desktop, right-click on the <guiicon>My
+ Computer</guiicon> icon, and select
+ <guimenuitem>Properties</guimenuitem>
</para>
</listitem>
@@ -6288,11 +6282,8 @@
startup, you also need to install the MySQL Startup Item. For
MySQL ¤t-series;, it is part of the Mac OS X installation
disk images as a separate installation package. Simply
- double-click the
-
- <guiicon>MySQLStartupItem.pkg</guiicon>
-
- icon and follow the instructions to install it.
+ double-click the <guiicon>MySQLStartupItem.pkg</guiicon> icon and
+ follow the instructions to install it.
</para>
<para>
@@ -8426,10 +8417,11 @@
<para>
If you have gotten to the <command>make</command> stage and
the distribution does not compile, please report it in our
- bugs database at <ulink url="http://bugs.mysql.com/"/>. If
- you have installed the latest versions of the required GNU
- tools, and they crash trying to process our configuration
- files, please report that also. However, if you execute
+ bugs database using the instructions given in
+ <xref linkend="bug-reports"/>. If you have installed the
+ latest versions of the required GNU tools, and they crash
+ trying to process our configuration files, please report
+ that also. However, if you execute
<literal>aclocal</literal> and get a <literal>command not
found</literal> error or a similar problem, do not report
it. Instead, make sure that all the necessary tools are
Modified: trunk/refman-5.0/porting.xml
===================================================================
--- trunk/refman-5.0/porting.xml 2006-01-30 18:36:44 UTC (rev 1134)
+++ trunk/refman-5.0/porting.xml 2006-01-30 20:35:42 UTC (rev 1135)
@@ -826,8 +826,8 @@
have found reproducible bug that should be easy to fix! FTP
the tables and the binary log to
<ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> and
- enter it into our bugs system at
- <ulink url="http://bugs.mysql.com/"/>. (Please note that the
+ report it in our bugs database using the instructions given
+ in <xref linkend="bug-reports"/>. (Please note that the
<filename>/pub/mysql/upload/</filename> FTP directory is not
listable, so you'll not see what you've uploaded in your FTP
client.) If you are a support customer, you can use the
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-30 18:36:44 UTC (rev 1134)
+++ trunk/refman-5.1/installing.xml 2006-01-30 20:35:42 UTC (rev 1135)
@@ -2853,7 +2853,8 @@
</itemizedlist>
<para>
- You may also have the following optional requirements:
+ There may also be other requirements, depending on how you plan
+ to use MySQL:
</para>
<itemizedlist>
@@ -2861,7 +2862,7 @@
<listitem>
<para>
If you plan to connect to the MySQL server via ODBC, you
- also need a Connector/ODBC driver. See
+ need a Connector/ODBC driver. See
<xref linkend="odbc-connector"/>.
</para>
</listitem>
@@ -2958,11 +2959,11 @@
<para>
The MySQL Installation Wizard and MySQL Configuration Wizard are
- available in the Essentials and Complete install packages, and
+ available in the Essentials and Complete install packages. They
are recommended for most standard MySQL installations.
Exceptions include users who need to install multiple instances
- of MySQL on a single server and advanced users who want complete
- control of server configuration.
+ of MySQL on a single server host and advanced users who want
+ complete control of server configuration.
</para>
</section>
@@ -2986,10 +2987,10 @@
<para>
The MySQL Installation Wizard is the standard installer for
- all MySQL ¤t-series; server distributions. Users of
- previous versions of MySQL need to shut down and remove their
- existing MySQL installations manually before installing MySQL
- with the MySQL Installation Wizard. See
+ all MySQL server distributions, version 4.1.5 and higher.
+ Users of previous versions of MySQL need to shut down and
+ remove their existing MySQL installations manually before
+ installing MySQL with the MySQL Installation Wizard. See
<xref linkend="mysql-install-wizard-upgrading"/>, for more
information on upgrading from a previous version.
</para>
@@ -3026,9 +3027,9 @@
Improving the MySQL Installation Wizard depends on the support
and feedback of users like you. If you find that the MySQL
Installation Wizard is lacking some feature important to you,
- or if you discover a bug, please use our
- <ulink url="http://bugs.mysql.com">MySQL Bug System</ulink> to
- request features or report problems.
+ or if you discover a bug, please report it in our bugs
+ database using the instructions given in
+ <xref linkend="bug-reports"/>.
</para>
<remark>
@@ -3099,7 +3100,7 @@
<title>&title-mysql-install-wizard-starting;</title>
<para>
- The MySQL server installation packages can be downloaded from
+ The MySQL installation packages can be downloaded from
<ulink url="&base-url-downloads;"/>. If the package you
download is contained within a Zip archive, you need to
extract the archive first.
@@ -3181,21 +3182,17 @@
<para>
If you wish to change the installation path or the specific
components that are installed by the MySQL Installation
- Wizard, you should choose the
- <emphasis role="bold">Custom</emphasis> installation type.
+ Wizard, choose the <emphasis role="bold">Custom</emphasis>
+ installation type.
</para>
<para>
- All available components are listed in a tree view on the left
- side of the custom install dialog. Components that are not
- installed have a red
-
- <guiicon>X</guiicon>
-
- icon; components that are installed have a gray icon. To
- change whether a component is installed, click on that
- component's icon and choose a new option from the drop-down
- list that appears.
+ A tree view on the left side of the custom install dialog
+ lists all available components. Components that are not
+ installed have a red <guiicon>X</guiicon> icon; components
+ that are installed have a gray icon. To change whether a
+ component is installed, click on that component's icon and
+ choose a new option from the drop-down list that appears.
</para>
<para>
@@ -3475,9 +3472,9 @@
The MySQL Configuration Wizard is to a large extent the result
of feedback MySQL AB has received from many users over a
period of several years. However, if you find that it lacks
- some feature important to you, or if you discover a bug,
- please use our <ulink url="http://bugs.mysql.com">MySQL Bug
- System</ulink> to request features or report problems.
+ some feature important to you, please report it in our bugs
+ database using the instructions given in
+ <xref linkend="bug-reports"/>.
</para>
<remark>
@@ -4809,12 +4806,9 @@
<listitem>
<para>
- On the Windows desktop, right-click on the
-
- <guiicon>My
- Computer</guiicon>
-
- icon, and select <guimenuitem>Properties</guimenuitem>
+ On the Windows desktop, right-click on the <guiicon>My
+ Computer</guiicon> icon, and select
+ <guimenuitem>Properties</guimenuitem>
</para>
</listitem>
@@ -6284,11 +6278,8 @@
startup, you also need to install the MySQL Startup Item. For
MySQL ¤t-series;, it is part of the Mac OS X installation
disk images as a separate installation package. Simply
- double-click the
-
- <guiicon>MySQLStartupItem.pkg</guiicon>
-
- icon and follow the instructions to install it.
+ double-click the <guiicon>MySQLStartupItem.pkg</guiicon> icon and
+ follow the instructions to install it.
</para>
<para>
@@ -8431,10 +8422,11 @@
<para>
If you have gotten to the <command>make</command> stage and
the distribution does not compile, please report it in our
- bugs database at <ulink url="http://bugs.mysql.com/"/>. If
- you have installed the latest versions of the required GNU
- tools, and they crash trying to process our configuration
- files, please report that also. However, if you execute
+ bugs database using the instructions given in
+ <xref linkend="bug-reports"/>. If you have installed the
+ latest versions of the required GNU tools, and they crash
+ trying to process our configuration files, please report
+ that also. However, if you execute
<literal>aclocal</literal> and get a <literal>command not
found</literal> error or a similar problem, do not report
it. Instead, make sure that all the necessary tools are
Modified: trunk/refman-5.1/porting.xml
===================================================================
--- trunk/refman-5.1/porting.xml 2006-01-30 18:36:44 UTC (rev 1134)
+++ trunk/refman-5.1/porting.xml 2006-01-30 20:35:42 UTC (rev 1135)
@@ -826,8 +826,8 @@
have found reproducible bug that should be easy to fix! FTP
the tables and the binary log to
<ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> and
- enter it into our bugs system at
- <ulink url="http://bugs.mysql.com/"/>. (Please note that the
+ report it in our bugs database using the instructions given
+ in <xref linkend="bug-reports"/>. (Please note that the
<filename>/pub/mysql/upload/</filename> FTP directory is not
listable, so you'll not see what you've uploaded in your FTP
client.) If you are a support customer, you can use the
Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml 2006-01-30 18:36:44 UTC (rev 1134)
+++ trunk/refman-5.1/replication.xml 2006-01-30 20:35:42 UTC (rev 1135)
@@ -1784,7 +1784,7 @@
The <literal>USER()</literal>, <literal>UUID()</literal>, and
<literal>LOAD_FILE()</literal> functions are replicated
without change and thus do not work reliably on the slave
- unless row-based replication is enabled. (See
+ unless row-based replication is enabled. (See
<xref linkend="replication-row-based"/>.)
</para>
</listitem>
@@ -1823,7 +1823,7 @@
<para>
Replication works correctly between MySQL 5.0 and 5.1 masters
and slaves in any combination, even if the master and slave
- have different global character set variables, and even if the
+ have different global character set variables, and even if the
master and slave have different global timezone variables.
(Note that this is not true in cases where the master, slave,
or both are running MySQL 4.1 or earlier.)
@@ -1938,10 +1938,10 @@
followed by <literal>INSERT INTO mytable
VALUES(CONVERT_TZ(...,...,@time_zone))</literal>.
</para>
-
+
<para>
Replication of session variables is not a problem where
- row-based replication is being used. See
+ row-based replication is being used. See
<xref linkend="replication-row-based"/>.
</para>
</listitem>
@@ -1994,7 +1994,7 @@
replicaiton as follows: If the replication slave SQL thread
fails to execute a transaction because of an
<literal>InnoDB</literal> deadlock or because it exceeded the
- <literal>InnoDB</literal>
+ <literal>InnoDB</literal>
<literal>innodb_lock_wait_timeout</literal> value, or the
<literal>NDBCluster</literal>
<literal>TransactionDeadlockDetectionTimeout</literal> or
@@ -2003,8 +2003,8 @@
<literal>slave_transaction_retries</literal> times before
stopping with an error. The default value is 10. The total
retry count can be seen in the output of <literal>SHOW
- STATUS</literal>; see
- <xref linkend="server-status-variables"/>.
+ STATUS</literal>; see
+ <xref linkend="server-status-variables"/>.
</para>
</listitem>
@@ -2035,7 +2035,7 @@
modification is <firstterm>non-deterministic</firstterm>; that
is, it is left to the will of the query optimizer. (This is in
general not a good practice, even outside of replication.) For
- a detailed explanation of this issue, see
+ a detailed explanation of this issue, see
<xref linkend="open-bugs"/>.
</para>
</listitem>
@@ -2097,10 +2097,10 @@
<para>
Note that the following item does not apply where row-based
replication is in use, as row-based replication does not
- require that temporary tables be replicated at all. (See
+ require that temporary tables be replicated at all. (See
<xref linkend="replication-row-based"/>.)
</para>
-
+
<para>
Temporary tables are replicated except in the case where you
shut down the slave server (not just the slave threads) and
@@ -2150,11 +2150,12 @@
</listitem>
</orderedlist>
-
+
<remark role="note">
[js] Ive commented this out, since RBR fixes the problem,
correct?
</remark>
+
<!--
<remark role="todo">
[pd] Is this a promise we should make?
@@ -2253,7 +2254,7 @@
[js] Cut next para altogether, since the option was made
obsolete in the previous release series?
</remark>
-
+
<para>
<emphasis role="bold">Note</emphasis>:
<option>--innodb-safe-binlog</option> is not needed in MySQL
@@ -3381,11 +3382,12 @@
multiple-table updates, each table is filtered
separately according to the rules. Some updates may be
executed and some not, depending on the rules and the
- changes to be made.
- Row-based replication handles correctly cases that would
- not replicate correctly with statement-based replication,
- as in this example which assumes that tables in the
+ changes to be made. Row-based replication handles
+ correctly cases that would not replicate correctly
+ with statement-based replication, as in this example
+ which assumes that tables in the
<literal>foo</literal> database should be replicated:
+
<programlisting>
mysql> <userinput>USE bar;</userinput>
mysql> <userinput>INSERT INTO foo.sometable VALUES (1);</userinput>
Modified: trunk/tools/xmlformat.conf
===================================================================
--- trunk/tools/xmlformat.conf 2006-01-30 18:36:44 UTC (rev 1134)
+++ trunk/tools/xmlformat.conf 2006-01-30 20:35:42 UTC (rev 1135)
@@ -83,7 +83,7 @@
literal replaceable userinput command option emphasis xref link ulink email \
filename citetitle keycap \
-guibutton guilabel guimenu guisubmenu guimenuitem \
+guibutton guilabel guimenu guisubmenu guimenuitem guiicon \
quote superscript firstterm \
methodname classname property function phrase envar foreignphrase errortext \
classname type varname
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1135 - in trunk: . refman-4.1 refman-5.0 refman-5.1 tools | paul | 30 Jan |
