Author: paul
Date: 2006-01-30 18:17:50 +0100 (Mon, 30 Jan 2006)
New Revision: 1131
Log:
r6940@frost: paul | 2006-01-30 11:16:40 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/data-types.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/introduction.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.0/introduction.xml
trunk/refman-5.0/stored-procedures.xml
trunk/refman-5.1/data-types.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/introduction.xml
trunk/refman-5.1/stored-procedures.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6917
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6940
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2006-01-30 16:53:20 UTC (rev 1130)
+++ trunk/refman-4.1/data-types.xml 2006-01-30 17:17:50 UTC (rev 1131)
@@ -1792,7 +1792,7 @@
<secondary>ENUM</secondary>
</indexterm>
- <literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal>
+ <literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
</para>
<para>
@@ -1800,7 +1800,7 @@
value, chosen from the list of values
<literal>'<replaceable>value1</replaceable>'</literal>,
<literal>'<replaceable>value2</replaceable>'</literal>,
- <literal>…</literal>, <literal>NULL</literal> or the
+ <literal>...</literal>, <literal>NULL</literal> or the
special <literal>''</literal> error value. An
<literal>ENUM</literal> column can have a maximum of 65,535
distinct values. <literal>ENUM</literal> values are
@@ -1825,7 +1825,7 @@
<secondary>SET</secondary>
</indexterm>
- <literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal>
+ <literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
</para>
<para>
@@ -1833,9 +1833,9 @@
each of which must be chosen from the list of values
<literal>'<replaceable>value1</replaceable>'</literal>,
<literal>'<replaceable>value2</replaceable>'</literal>,
- <literal>…</literal> A <literal>SET</literal> column
- can have a maximum of 64 members. <literal>SET</literal>
- values are represented internally as integers.
+ <literal>...</literal> A <literal>SET</literal> column can
+ have a maximum of 64 members. <literal>SET</literal> values
+ are represented internally as integers.
</para>
<remark role="help-description-end"/>
@@ -5262,12 +5262,12 @@
< 2<superscript>32</superscript></entry>
</row>
<row>
- <entry><literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal></entry>
+ <entry><literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal></entry>
<entry>1 or 2 bytes, depending on the number of enumeration values (65,535
values maximum)</entry>
</row>
<row>
- <entry><literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal></entry>
+ <entry><literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal></entry>
<entry>1, 2, 3, 4, or 8 bytes, depending on the number of set members (64
members maximum)</entry>
</row>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-01-30 16:53:20 UTC (rev 1130)
+++ trunk/refman-4.1/installing.xml 2006-01-30 17:17:50 UTC (rev 1131)
@@ -859,34 +859,26 @@
</listitem>
<listitem>
- <remark role="todo">
- This makes a false characterization of max vs. non-max as
- transactional vs. non-transactional. Replace this with
- descriptions of Standard/Max/Pro/Classic?
- </remark>
-
<para>
To satisfy different user requirements, we provide two
- different binary versions: one compiled with the
- non-transactional storage engines (a small, fast binary),
- and one configured with the most important extended
- options like transaction-safe tables. Both versions are
- compiled from the same source distribution. All native
- MySQL clients can connect to servers from either MySQL
- version.
+ different binary versions. One is compiled with the core
+ feature set. The other (MySQL-Max) is compiled with an
+ extended feature set. Both versions are compiled from the
+ same source distribution. All native MySQL clients can
+ connect to servers from either MySQL version.
</para>
<para>
- The extended MySQL binary distribution is marked with the
- <literal>-max</literal> suffix and is configured with the
- same options as <command>mysqld-max</command>. See
+ The extended MySQL binary distribution is identified by
+ the <literal>-max</literal> suffix and is configured with
+ the same options as <command>mysqld-max</command>. See
<xref linkend="mysqld-max"/>.
</para>
<para>
- If you want to use the <literal>MySQL-Max</literal> RPM,
- you must first install the standard
- <literal>MySQL-server</literal> RPM.
+ For RPM distributions, if you want to use the
+ <literal>MySQL-Max</literal> RPM, you must first install
+ the standard <literal>MySQL-server</literal> RPM.
</para>
</listitem>
@@ -903,25 +895,25 @@
<para>
You want to install MySQL at some explicit location. The
standard binary distributions are ready to run at any
- place, but you may want to have even more flexibility to
- place MySQL components where you want.
+ installation location, but you might require even more
+ flexibility to place MySQL components where you want.
</para>
</listitem>
<listitem>
<para>
- You want to configure <command>mysqld</command> with some
- extra features that are not included in the standard
- binary distributions. Here is a list of the most common
- extra options that you may want to use:
+ You want to configure <command>mysqld</command> to ensure
+ that features are available that might not be included in
+ the standard binary distributions. Here is a list of the
+ most common extra options that you may want to use to
+ ensure feature availability:
</para>
<itemizedlist>
<listitem>
<para>
- <option>--with-innodb</option> (default for MySQL 4.0
- and up)
+ <option>--with-innodb</option>
</para>
</listitem>
@@ -1043,8 +1035,9 @@
<para>
No one is <emphasis>required</emphasis> to download a new
- release. The News section tells you if the new release has
- something you really want. See <xref linkend="news"/>.
+ release. The News section helps you determine whether the new
+ release has something you really want. See
+ <xref linkend="news"/>.
</para>
<para>
@@ -1089,7 +1082,7 @@
We make fixes available as soon as we have identified and
corrected small or non-critical but annoying bugs. The
fixes are available immediately from our public BitKeeper
- repositories, and will be included in the next release.
+ repositories, and are included in the next release.
</para>
</listitem>
@@ -1132,7 +1125,7 @@
</para>
<para>
- Here is a description of how our build process works:
+ Here is a description of our build process:
</para>
<itemizedlist>
@@ -1163,7 +1156,8 @@
<listitem>
<para>
- We create test cases for all new features we add to MySQL.
+ We create test cases for each new feature that we add to
+ MySQL.
</para>
</listitem>
@@ -1171,18 +1165,18 @@
<para>
Before we start to build a new MySQL release, we ensure
that all reported repeatable bugs for that MySQL version
- (3.23.x, 4.0.x, and so forth) are fixed. If something is
- impossible to fix (due to some internal design decision in
- MySQL), we document this in the manual. See
- <xref linkend="bugs"/>.
+ (3.23.x, 4.0.x, 4.1.x, 5.0.x, 5.1.x, and so on) are fixed.
+ If something is impossible to fix due to some internal
+ design decision in MySQL, we document this in the manual.
+ See <xref linkend="bugs"/>.
</para>
</listitem>
<listitem>
<para>
We do a build on all platforms for which we support
- binaries (15+ platforms) and run our test suite and
- benchmark suite on all of them.
+ binaries and run our test suite and benchmark suite on all
+ of them.
</para>
</listitem>
@@ -1222,8 +1216,9 @@
<listitem>
<para>
To quickly give our users access to the latest MySQL
- features, we produce a new MySQL release every 4-8 weeks.
- Source code snapshots are built daily and are available at
+ features, we try to produce a new MySQL release every 4-8
+ weeks. Source code snapshots are built daily and are
+ available at
<ulink url="http://downloads.mysql.com/snapshots.php"/>.
</para>
</listitem>
@@ -1231,8 +1226,8 @@
<listitem>
<para>
If, despite our best efforts, we recieve any bug reports
- after the release is made that there is a critical problem
- with the build on a specific platform, we fix it at once
+ after a release is issued that a critical problem exists
+ for the build on a specific platform, we fix it at once
and build a new <literal>'a'</literal> release for that
platform. Thanks to our large user base, problems are
found and resolved very quickly.
@@ -1277,6 +1272,12 @@
</para>
<para>
+ RPM distributions prior to MySQL 3.22 are user-contributed.
+ Beginning with MySQL 3.22, RPM distributions which we make
+ available through our Web site are generated by MySQL AB.
+ </para>
+
+ <para>
For Windows distributions, see
<xref linkend="windows-installation"/>.
</para>
@@ -1299,6 +1300,21 @@
</para>
<para>
+ Anyone who has more optimal options for any of the following
+ <literal>configure</literal> commands can mail them to the
+ MySQL <literal>internals</literal> mailing list. See
+ <xref linkend="mailing-lists"/>.
+ </para>
+
+ <para>
+ If you want to compile a debug version of MySQL, you should
+ add <option>--with-debug</option> or
+ <option>--with-debug=full</option> to the following
+ <command>configure</command> commands and remove any
+ <option>-fomit-frame-pointer</option> options.
+ </para>
+
+ <para>
The following binaries are built on MySQL AB development
systems:
</para>
@@ -1979,27 +1995,6 @@
</itemizedlist>
- <para>
- Anyone who has more optimal options for any of the preceding
- configurations listed can always mail them to the MySQL
- <literal>internals</literal> mailing list. See
- <xref linkend="mailing-lists"/>.
- </para>
-
- <para>
- RPM distributions prior to MySQL 3.22 are user-contributed.
- Beginning with MySQL 3.22, RPM distributions are generated by
- MySQL AB.
- </para>
-
- <para>
- If you want to compile a debug version of MySQL, you should
- add <option>--with-debug</option> or
- <option>--with-debug=full</option> to the preceding
- <command>configure</command> commands and remove any
- <option>-fomit-frame-pointer</option> options.
- </para>
-
</section>
</section>
@@ -2034,13 +2029,13 @@
</indexterm>
<para>
- Check the MySQL downloads page
- (<ulink url="&base-url-downloads;"/>) for information about the
- current version and for downloading instructions. For a complete
- up-to-date list of MySQL download mirror sites, see
- <ulink url="&base-url-downloads;mirrors.html"/>. There you can
- also find information about becoming a MySQL mirror site and how
- to report a bad or out-of-date mirror.
+ Check our downloads page at <ulink url="&base-url-downloads;"/>
+ for information about the current version of MySQL and for
+ downloading instructions. For a complete up-to-date list of
+ MySQL download mirror sites, see
+ <ulink url="&base-url-downloads;mirrors.html"/>. You can also
+ find information there about becoming a MySQL mirror site and
+ how to report a bad or out-of-date mirror.
</para>
<para>
Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml 2006-01-30 16:53:20 UTC (rev 1130)
+++ trunk/refman-4.1/introduction.xml 2006-01-30 17:17:50 UTC (rev 1131)
@@ -1419,7 +1419,7 @@
and <filename>.frm</filename> files to which the table
corresponds. (Nevertheless, it is preferable to use
<literal>RENAME TABLE</literal> or <literal>ALTER TABLE
- … RENAME</literal> and let the server rename the
+ ... RENAME</literal> and let the server rename the
files.)
</para>
</listitem>
@@ -1990,9 +1990,9 @@
</indexterm>
<para>
- MySQL Server doesn't support the <literal>SELECT … INTO
+ MySQL Server doesn't support the <literal>SELECT ... INTO
TABLE</literal> Sybase SQL extension. Instead, MySQL Server
- supports the <literal>INSERT INTO … SELECT</literal>
+ supports the <literal>INSERT INTO ... SELECT</literal>
standard SQL syntax, which is basically the same thing. See
<xref linkend="insert-select"/>. For example:
</para>
@@ -2004,8 +2004,8 @@
</programlisting>
<para>
- Alternatively, you can use <literal>SELECT … INTO
- OUTFILE</literal> or <literal>CREATE TABLE …
+ Alternatively, you can use <literal>SELECT ... INTO
+ OUTFILE</literal> or <literal>CREATE TABLE ...
SELECT</literal>.
</para>
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2006-01-30 16:53:20 UTC (rev 1130)
+++ trunk/refman-5.0/data-types.xml 2006-01-30 17:17:50 UTC (rev 1131)
@@ -1802,7 +1802,7 @@
<secondary>ENUM</secondary>
</indexterm>
- <literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal>
+ <literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
</para>
<para>
@@ -1810,7 +1810,7 @@
value, chosen from the list of values
<literal>'<replaceable>value1</replaceable>'</literal>,
<literal>'<replaceable>value2</replaceable>'</literal>,
- <literal>…</literal>, <literal>NULL</literal> or the
+ <literal>...</literal>, <literal>NULL</literal> or the
special <literal>''</literal> error value. An
<literal>ENUM</literal> column can have a maximum of 65,535
distinct values. <literal>ENUM</literal> values are
@@ -1835,7 +1835,7 @@
<secondary>SET</secondary>
</indexterm>
- <literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal>
+ <literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
</para>
<para>
@@ -1843,9 +1843,9 @@
each of which must be chosen from the list of values
<literal>'<replaceable>value1</replaceable>'</literal>,
<literal>'<replaceable>value2</replaceable>'</literal>,
- <literal>…</literal> A <literal>SET</literal> column
- can have a maximum of 64 members. <literal>SET</literal>
- values are represented internally as integers.
+ <literal>...</literal> A <literal>SET</literal> column can
+ have a maximum of 64 members. <literal>SET</literal> values
+ are represented internally as integers.
</para>
<remark role="help-description-end"/>
@@ -5138,12 +5138,12 @@
< 2<superscript>32</superscript></entry>
</row>
<row>
- <entry><literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal></entry>
+ <entry><literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal></entry>
<entry>1 or 2 bytes, depending on the number of enumeration values (65,535
values maximum)</entry>
</row>
<row>
- <entry><literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal></entry>
+ <entry><literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal></entry>
<entry>1, 2, 3, 4, or 8 bytes, depending on the number of set members (64
members maximum)</entry>
</row>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-30 16:53:20 UTC (rev 1130)
+++ trunk/refman-5.0/installing.xml 2006-01-30 17:17:50 UTC (rev 1131)
@@ -860,34 +860,26 @@
</listitem>
<listitem>
- <remark role="todo">
- This makes a false characterization of max vs. non-max as
- transactional vs. non-transactional. Replace this with
- descriptions of Standard/Max/Pro/Classic?
- </remark>
-
<para>
To satisfy different user requirements, we provide two
- different binary versions: one compiled with the
- non-transactional storage engines (a small, fast binary),
- and one configured with the most important extended
- options like transaction-safe tables. Both versions are
- compiled from the same source distribution. All native
- MySQL clients can connect to servers from either MySQL
- version.
+ different binary versions. One is compiled with the core
+ feature set. The other (MySQL-Max) is compiled with an
+ extended feature set. Both versions are compiled from the
+ same source distribution. All native MySQL clients can
+ connect to servers from either MySQL version.
</para>
<para>
- The extended MySQL binary distribution is marked with the
- <literal>-max</literal> suffix and is configured with the
- same options as <command>mysqld-max</command>. See
+ The extended MySQL binary distribution is identified by
+ the <literal>-max</literal> suffix and is configured with
+ the same options as <command>mysqld-max</command>. See
<xref linkend="mysqld-max"/>.
</para>
<para>
- If you want to use the <literal>MySQL-Max</literal> RPM,
- you must first install the standard
- <literal>MySQL-server</literal> RPM.
+ For RPM distributions, if you want to use the
+ <literal>MySQL-Max</literal> RPM, you must first install
+ the standard <literal>MySQL-server</literal> RPM.
</para>
</listitem>
@@ -904,25 +896,25 @@
<para>
You want to install MySQL at some explicit location. The
standard binary distributions are ready to run at any
- place, but you may want to have even more flexibility to
- place MySQL components where you want.
+ installation location, but you might require even more
+ flexibility to place MySQL components where you want.
</para>
</listitem>
<listitem>
<para>
- You want to configure <command>mysqld</command> with some
- extra features that are not included in the standard
- binary distributions. Here is a list of the most common
- extra options that you may want to use:
+ You want to configure <command>mysqld</command> to ensure
+ that features are available that might not be included in
+ the standard binary distributions. Here is a list of the
+ most common extra options that you may want to use to
+ ensure feature availability:
</para>
<itemizedlist>
<listitem>
<para>
- <option>--with-innodb</option> (enabled by default for
- all MySQL ¤t-series; binary releases)
+ <option>--with-innodb</option>
</para>
</listitem>
@@ -1038,8 +1030,9 @@
<para>
No one is <emphasis>required</emphasis> to download a new
- release. The News section tells you if the new release has
- something you really want. See <xref linkend="news"/>.
+ release. The News section helps you determine whether the new
+ release has something you really want. See
+ <xref linkend="news"/>.
</para>
<para>
@@ -1084,7 +1077,7 @@
We make fixes available as soon as we have identified and
corrected small or non-critical but annoying bugs. The
fixes are available immediately from our public BitKeeper
- repositories, and will be included in the next release.
+ repositories, and are included in the next release.
</para>
</listitem>
@@ -1127,7 +1120,7 @@
</para>
<para>
- Here is a description of how our build process works:
+ Here is a description of our build process:
</para>
<itemizedlist>
@@ -1158,7 +1151,8 @@
<listitem>
<para>
- We create test cases for all new features we add to MySQL.
+ We create test cases for each new feature that we add to
+ MySQL.
</para>
</listitem>
@@ -1166,9 +1160,9 @@
<para>
Before we start to build a new MySQL release, we ensure
that all reported repeatable bugs for that MySQL version
- (3.23.x, 4.0.x, 4.1.x, 5.0.x, and so on) are fixed. If
- something is impossible to fix (due to some internal
- design decision in MySQL), we document this in the manual.
+ (3.23.x, 4.0.x, 4.1.x, 5.0.x, 5.1.x, and so on) are fixed.
+ If something is impossible to fix due to some internal
+ design decision in MySQL, we document this in the manual.
See <xref linkend="bugs"/>.
</para>
</listitem>
@@ -1176,8 +1170,8 @@
<listitem>
<para>
We do a build on all platforms for which we support
- binaries (15+ platforms) and run our test suite and
- benchmark suite on all of them.
+ binaries and run our test suite and benchmark suite on all
+ of them.
</para>
</listitem>
@@ -1217,8 +1211,9 @@
<listitem>
<para>
To quickly give our users access to the latest MySQL
- features, we produce a new MySQL release every 4-8 weeks.
- Source code snapshots are built daily and are available at
+ features, we try to produce a new MySQL release every 4-8
+ weeks. Source code snapshots are built daily and are
+ available at
<ulink url="http://downloads.mysql.com/snapshots.php"/>.
</para>
</listitem>
@@ -1226,8 +1221,8 @@
<listitem>
<para>
If, despite our best efforts, we recieve any bug reports
- after the release is made that there is a critical problem
- with the build on a specific platform, we fix it at once
+ after a release is issued that a critical problem exists
+ for the build on a specific platform, we fix it at once
and build a new <literal>'a'</literal> release for that
platform. Thanks to our large user base, problems are
found and resolved very quickly.
@@ -1272,6 +1267,12 @@
</para>
<para>
+ The RPM distributions for MySQL ¤t-series; releases
+ which we make available through our Web site are generated by
+ MySQL AB.
+ </para>
+
+ <para>
For Windows distributions, see
<xref linkend="windows-installation"/>.
</para>
@@ -1293,6 +1294,21 @@
<command>tar</command> file distribution.
</para>
+ <para>
+ Anyone who has more optimal options for any of the following
+ <literal>configure</literal> commands can mail them to the
+ MySQL <literal>internals</literal> mailing list. See
+ <xref linkend="mailing-lists"/>.
+ </para>
+
+ <para>
+ If you want to compile a debug version of MySQL, you should
+ add <option>--with-debug</option> or
+ <option>--with-debug=full</option> to the following
+ <command>configure</command> commands and remove any
+ <option>-fomit-frame-pointer</option> options.
+ </para>
+
<remark role="todo">
Verify that the info in this list is current. (Aren't we doing
any Linux builds with the 2.6 kernel yet?)
@@ -1979,27 +1995,6 @@
</itemizedlist>
- <para>
- Anyone who has more optimal options for any of the preceding
- configurations listed can always mail them to the MySQL
- <literal>internals</literal> mailing list. See
- <xref linkend="mailing-lists"/>.
- </para>
-
- <para>
- The RPM distributions for MySQL ¤t-series; releases
- which we make available through our Web site are generated by
- MySQL AB.
- </para>
-
- <para>
- If you want to compile a debug version of MySQL, you should
- add <option>--with-debug</option> or
- <option>--with-debug=full</option> to the preceding
- <command>configure</command> commands and remove any
- <option>-fomit-frame-pointer</option> options.
- </para>
-
</section>
</section>
@@ -2034,13 +2029,13 @@
</indexterm>
<para>
- Check the MySQL downloads page
- (<ulink url="&base-url-downloads;"/>) for information about the
- current version and for downloading instructions. For a complete
- up-to-date list of MySQL download mirror sites, see
- <ulink url="&base-url-downloads;mirrors.html"/>. There you can
- also find information about becoming a MySQL mirror site and how
- to report a bad or out-of-date mirror.
+ Check our downloads page at <ulink url="&base-url-downloads;"/>
+ for information about the current version of MySQL and for
+ downloading instructions. For a complete up-to-date list of
+ MySQL download mirror sites, see
+ <ulink url="&base-url-downloads;mirrors.html"/>. You can also
+ find information there about becoming a MySQL mirror site and
+ how to report a bad or out-of-date mirror.
</para>
<para>
Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml 2006-01-30 16:53:20 UTC (rev 1130)
+++ trunk/refman-5.0/introduction.xml 2006-01-30 17:17:50 UTC (rev 1131)
@@ -1023,8 +1023,8 @@
<filename>.MYI</filename>, and <filename>.frm</filename>
files to which the table corresponds. (Nevertheless, it
is preferable to use <literal>RENAME TABLE</literal> or
- <literal>ALTER TABLE … RENAME</literal> and let
- the server rename the files.)
+ <literal>ALTER TABLE ... RENAME</literal> and let the
+ server rename the files.)
</para>
</listitem>
@@ -1608,9 +1608,9 @@
</indexterm>
<para>
- MySQL Server doesn't support the <literal>SELECT … INTO
+ MySQL Server doesn't support the <literal>SELECT ... INTO
TABLE</literal> Sybase SQL extension. Instead, MySQL Server
- supports the <literal>INSERT INTO … SELECT</literal>
+ supports the <literal>INSERT INTO ... SELECT</literal>
standard SQL syntax, which is basically the same thing. See
<xref linkend="insert-select"/>. For example:
</para>
@@ -1622,13 +1622,13 @@
</programlisting>
<para>
- Alternatively, you can use <literal>SELECT … INTO
- OUTFILE</literal> or <literal>CREATE TABLE …
+ Alternatively, you can use <literal>SELECT ... INTO
+ OUTFILE</literal> or <literal>CREATE TABLE ...
SELECT</literal>.
</para>
<para>
- As of MySQL 5.0, you can use <literal>SELECT …
+ As of MySQL 5.0, you can use <literal>SELECT ...
INTO</literal> with user-defined variables. The same syntax
can also be used inside stored routines using cursors and
local variables. See <xref linkend="select-into-statement"/>.
Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml 2006-01-30 16:53:20 UTC (rev 1130)
+++ trunk/refman-5.0/stored-procedures.xml 2006-01-30 17:17:50 UTC (rev 1131)
@@ -819,7 +819,7 @@
<remark role="help-description-begin"/>
<para>
- <literal>BEGIN … END</literal> syntax is used for writing
+ <literal>BEGIN ... END</literal> syntax is used for writing
compound statements, which can appear within stored routines and
triggers. A compound statement can contain multiple statements,
enclosed by the <literal>BEGIN</literal> and
@@ -908,8 +908,8 @@
<para>
<literal>DECLARE</literal> is allowed only inside a
- <literal>BEGIN … END</literal> compound statement and
- must be at its start, before any other statements.
+ <literal>BEGIN ... END</literal> compound statement and must be
+ at its start, before any other statements.
</para>
<para>
@@ -962,11 +962,11 @@
</para>
<para>
- The scope of a local variable is within the <literal>BEGIN
- … END</literal> block where it is declared. The
- variable can be referred to in blocks nested within the
- declaring block, except those blocks that declare a variable
- with the same name.
+ The scope of a local variable is within the <literal>BEGIN ...
+ END</literal> block where it is declared. The variable can be
+ referred to in blocks nested within the declaring block,
+ except those blocks that declare a variable with the same
+ name.
</para>
<remark role="help-description-end"/>
@@ -1006,12 +1006,11 @@
The <literal>SET</literal> statement in stored routines is
implemented as part of the pre-existing <literal>SET</literal>
syntax. This allows an extended syntax of <literal>SET a=x,
- b=y, …</literal> where different variable types
- (locally declared variables and global and session server
- variables) can be mixed. This also allows combinations of
- local variables and some options that make sense only for
- system variables; in that case, the options are recognized but
- ignored.
+ b=y, ...</literal> where different variable types (locally
+ declared variables and global and session server variables)
+ can be mixed. This also allows combinations of local variables
+ and some options that make sense only for system variables; in
+ that case, the options are recognized but ignored.
</para>
<remark role="help-description-end"/>
@@ -1062,7 +1061,7 @@
<para>
<emphasis role="bold">Important</emphasis>: SQL variable names
should not be the same as column names. If an SQL statement,
- such as a <literal>SELECT … INTO</literal> statement,
+ such as a <literal>SELECT ... INTO</literal> statement,
contains a reference to a column and a declared local variable
with the same name, MySQL currently interprets the reference
as the name of a variable. For example, in the following
@@ -1188,9 +1187,9 @@
<remark role="help-description-begin"/>
<para>
- The <literal>DECLARE … HANDLER</literal> statement
- specifies handlers that each may deal with one or more
- conditions. If one of these conditions occurs, the specified
+ The <literal>DECLARE ... HANDLER</literal> statement specifies
+ handlers that each may deal with one or more conditions. If
+ one of these conditions occurs, the specified
<replaceable>statement</replaceable> is executed.
<replaceable>statement</replaceable> can be a simple statement
(for example, <literal>SET <replaceable>var_name</replaceable>
@@ -1203,9 +1202,9 @@
For a <literal>CONTINUE</literal> handler, execution of the
current routine continues after execution of the handler
statement. For an <literal>EXIT</literal> handler, execution
- terminates for the <literal>BEGIN … END</literal>
- compound statement in which the handler is declared. (This is
- true even if the condition occurs in an inner block.) The
+ terminates for the <literal>BEGIN ... END</literal> compound
+ statement in which the handler is declared. (This is true even
+ if the condition occurs in an inner block.) The
<literal>UNDO</literal> handler type statement is not yet
supported.
</para>
@@ -1231,7 +1230,7 @@
<listitem>
<para>
A condition name previously specified with
- <literal>DECLARE … CONDITION</literal>. See
+ <literal>DECLARE ... CONDITION</literal>. See
<xref linkend="declare-conditions"/>.
</para>
</listitem>
@@ -1719,7 +1718,7 @@
<para>
This statement is used to exit any labeled flow control
- construct. It can be used within <literal>BEGIN …
+ construct. It can be used within <literal>BEGIN ...
END</literal> or loop constructs (<literal>LOOP</literal>,
<literal>REPEAT</literal>, <literal>WHILE</literal>).
</para>
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2006-01-30 16:53:20 UTC (rev 1130)
+++ trunk/refman-5.1/data-types.xml 2006-01-30 17:17:50 UTC (rev 1131)
@@ -1722,7 +1722,7 @@
<secondary>ENUM</secondary>
</indexterm>
- <literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal>
+ <literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
</para>
<para>
@@ -1730,7 +1730,7 @@
value, chosen from the list of values
<literal>'<replaceable>value1</replaceable>'</literal>,
<literal>'<replaceable>value2</replaceable>'</literal>,
- <literal>…</literal>, <literal>NULL</literal> or the
+ <literal>...</literal>, <literal>NULL</literal> or the
special <literal>''</literal> error value. An
<literal>ENUM</literal> column can have a maximum of 65,535
distinct values. <literal>ENUM</literal> values are
@@ -1755,7 +1755,7 @@
<secondary>SET</secondary>
</indexterm>
- <literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal>
+ <literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
</para>
<para>
@@ -1763,9 +1763,9 @@
each of which must be chosen from the list of values
<literal>'<replaceable>value1</replaceable>'</literal>,
<literal>'<replaceable>value2</replaceable>'</literal>,
- <literal>…</literal> A <literal>SET</literal> column
- can have a maximum of 64 members. <literal>SET</literal>
- values are represented internally as integers.
+ <literal>...</literal> A <literal>SET</literal> column can
+ have a maximum of 64 members. <literal>SET</literal> values
+ are represented internally as integers.
</para>
<remark role="help-description-end"/>
@@ -4866,12 +4866,12 @@
< 2<superscript>32</superscript></entry>
</row>
<row>
- <entry><literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal></entry>
+ <entry><literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal></entry>
<entry>1 or 2 bytes, depending on the number of enumeration values (65,535
values maximum)</entry>
</row>
<row>
- <entry><literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',…)</literal></entry>
+ <entry><literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal></entry>
<entry>1, 2, 3, 4, or 8 bytes, depending on the number of set members (64
members maximum)</entry>
</row>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-30 16:53:20 UTC (rev 1130)
+++ trunk/refman-5.1/installing.xml 2006-01-30 17:17:50 UTC (rev 1131)
@@ -860,34 +860,26 @@
</listitem>
<listitem>
- <remark role="todo">
- This makes a false characterization of max vs. non-max as
- transactional vs. non-transactional. Replace this with
- descriptions of Standard/Max/Pro/Classic?
- </remark>
-
<para>
To satisfy different user requirements, we provide two
- different binary versions: one compiled with the
- non-transactional storage engines (a small, fast binary),
- and one configured with the most important extended
- options like transaction-safe tables. Both versions are
- compiled from the same source distribution. All native
- MySQL clients can connect to servers from either MySQL
- version.
+ different binary versions. One is compiled with the core
+ feature set. The other (MySQL-Max) is compiled with an
+ extended feature set. Both versions are compiled from the
+ same source distribution. All native MySQL clients can
+ connect to servers from either MySQL version.
</para>
<para>
- The extended MySQL binary distribution is marked with the
- <literal>-max</literal> suffix and is configured with the
- same options as <command>mysqld-max</command>. See
+ The extended MySQL binary distribution is identified by
+ the <literal>-max</literal> suffix and is configured with
+ the same options as <command>mysqld-max</command>. See
<xref linkend="mysqld-max"/>.
</para>
<para>
- If you want to use the <literal>MySQL-Max</literal> RPM,
- you must first install the standard
- <literal>MySQL-server</literal> RPM.
+ For RPM distributions, if you want to use the
+ <literal>MySQL-Max</literal> RPM, you must first install
+ the standard <literal>MySQL-server</literal> RPM.
</para>
</listitem>
@@ -904,25 +896,25 @@
<para>
You want to install MySQL at some explicit location. The
standard binary distributions are ready to run at any
- place, but you may want to have even more flexibility to
- place MySQL components where you want.
+ installation location, but you might require even more
+ flexibility to place MySQL components where you want.
</para>
</listitem>
<listitem>
<para>
- You want to configure <command>mysqld</command> with some
- extra features that are not included in the standard
- binary distributions. Here is a list of the most common
- extra options that you may want to use:
+ You want to configure <command>mysqld</command> to ensure
+ that features are available that might not be included in
+ the standard binary distributions. Here is a list of the
+ most common extra options that you may want to use to
+ ensure feature availability:
</para>
<itemizedlist>
<listitem>
<para>
- <option>--with-innodb</option> (enabled by default for
- all MySQL ¤t-series; binary releases)
+ <option>--with-innodb</option>
</para>
</listitem>
@@ -1038,8 +1030,9 @@
<para>
No one is <emphasis>required</emphasis> to download a new
- release. The News section tells you if the new release has
- something you really want. See <xref linkend="news"/>.
+ release. The News section helps you determine whether the new
+ release has something you really want. See
+ <xref linkend="news"/>.
</para>
<para>
@@ -1084,7 +1077,7 @@
We make fixes available as soon as we have identified and
corrected small or non-critical but annoying bugs. The
fixes are available immediately from our public BitKeeper
- repositories, and will be included in the next release.
+ repositories, and are included in the next release.
</para>
</listitem>
@@ -1127,7 +1120,7 @@
</para>
<para>
- Here is a description of how our build process works:
+ Here is a description of our build process:
</para>
<itemizedlist>
@@ -1158,7 +1151,8 @@
<listitem>
<para>
- We create test cases for all new features we add to MySQL.
+ We create test cases for each new feature that we add to
+ MySQL.
</para>
</listitem>
@@ -1166,9 +1160,9 @@
<para>
Before we start to build a new MySQL release, we ensure
that all reported repeatable bugs for that MySQL version
- (3.23.x, 4.0.x, 4.1.x, 5.0.x, and so on) are fixed. If
- something is impossible to fix (due to some internal
- design decision in MySQL), we document this in the manual.
+ (3.23.x, 4.0.x, 4.1.x, 5.0.x, 5.1.x, and so on) are fixed.
+ If something is impossible to fix due to some internal
+ design decision in MySQL, we document this in the manual.
See <xref linkend="bugs"/>.
</para>
</listitem>
@@ -1176,8 +1170,8 @@
<listitem>
<para>
We do a build on all platforms for which we support
- binaries (15+ platforms) and run our test suite and
- benchmark suite on all of them.
+ binaries and run our test suite and benchmark suite on all
+ of them.
</para>
</listitem>
@@ -1217,8 +1211,9 @@
<listitem>
<para>
To quickly give our users access to the latest MySQL
- features, we produce a new MySQL release every 4-8 weeks.
- Source code snapshots are built daily and are available at
+ features, we try to produce a new MySQL release every 4-8
+ weeks. Source code snapshots are built daily and are
+ available at
<ulink url="http://downloads.mysql.com/snapshots.php"/>.
</para>
</listitem>
@@ -1226,8 +1221,8 @@
<listitem>
<para>
If, despite our best efforts, we recieve any bug reports
- after the release is made that there is a critical problem
- with the build on a specific platform, we fix it at once
+ after a release is issued that a critical problem exists
+ for the build on a specific platform, we fix it at once
and build a new <literal>'a'</literal> release for that
platform. Thanks to our large user base, problems are
found and resolved very quickly.
@@ -1272,6 +1267,12 @@
</para>
<para>
+ The RPM distributions for MySQL ¤t-series; releases
+ which we make available through our Web site are generated by
+ MySQL AB.
+ </para>
+
+ <para>
For Windows distributions, see
<xref linkend="windows-installation"/>.
</para>
@@ -1293,6 +1294,21 @@
<command>tar</command> file distribution.
</para>
+ <para>
+ Anyone who has more optimal options for any of the following
+ <literal>configure</literal> commands can mail them to the
+ MySQL <literal>internals</literal> mailing list. See
+ <xref linkend="mailing-lists"/>.
+ </para>
+
+ <para>
+ If you want to compile a debug version of MySQL, you should
+ add <option>--with-debug</option> or
+ <option>--with-debug=full</option> to the following
+ <command>configure</command> commands and remove any
+ <option>-fomit-frame-pointer</option> options.
+ </para>
+
<remark role="todo">
Verify that the info in this list is current. (Aren't we doing
any Linux builds with the 2.6 kernel yet?)
@@ -1979,27 +1995,6 @@
</itemizedlist>
- <para>
- Anyone who has more optimal options for any of the preceding
- configurations listed can always mail them to the MySQL
- <literal>internals</literal> mailing list. See
- <xref linkend="mailing-lists"/>.
- </para>
-
- <para>
- The RPM distributions for MySQL ¤t-series; releases
- which we make available through our Web site are generated by
- MySQL AB.
- </para>
-
- <para>
- If you want to compile a debug version of MySQL, you should
- add <option>--with-debug</option> or
- <option>--with-debug=full</option> to the preceding
- <command>configure</command> commands and remove any
- <option>-fomit-frame-pointer</option> options.
- </para>
-
</section>
</section>
@@ -2034,13 +2029,13 @@
</indexterm>
<para>
- Check the MySQL downloads page
- (<ulink url="&base-url-downloads;"/>) for information about the
- current version and for downloading instructions. For a complete
- up-to-date list of MySQL download mirror sites, see
- <ulink url="&base-url-downloads;mirrors.html"/>. There you can
- also find information about becoming a MySQL mirror site and how
- to report a bad or out-of-date mirror.
+ Check our downloads page at <ulink url="&base-url-downloads;"/>
+ for information about the current version of MySQL and for
+ downloading instructions. For a complete up-to-date list of
+ MySQL download mirror sites, see
+ <ulink url="&base-url-downloads;mirrors.html"/>. You can also
+ find information there about becoming a MySQL mirror site and
+ how to report a bad or out-of-date mirror.
</para>
<para>
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2006-01-30 16:53:20 UTC (rev 1130)
+++ trunk/refman-5.1/introduction.xml 2006-01-30 17:17:50 UTC (rev 1131)
@@ -782,8 +782,8 @@
<filename>.MYI</filename>, and <filename>.frm</filename>
files to which the table corresponds. (Nevertheless, it
is preferable to use <literal>RENAME TABLE</literal> or
- <literal>ALTER TABLE … RENAME</literal> and let
- the server rename the files.)
+ <literal>ALTER TABLE ... RENAME</literal> and let the
+ server rename the files.)
</para>
</listitem>
@@ -1367,9 +1367,9 @@
</indexterm>
<para>
- MySQL Server doesn't support the <literal>SELECT … INTO
+ MySQL Server doesn't support the <literal>SELECT ... INTO
TABLE</literal> Sybase SQL extension. Instead, MySQL Server
- supports the <literal>INSERT INTO … SELECT</literal>
+ supports the <literal>INSERT INTO ... SELECT</literal>
standard SQL syntax, which is basically the same thing. See
<xref linkend="insert-select"/>. For example:
</para>
@@ -1381,13 +1381,13 @@
</programlisting>
<para>
- Alternatively, you can use <literal>SELECT … INTO
- OUTFILE</literal> or <literal>CREATE TABLE …
+ Alternatively, you can use <literal>SELECT ... INTO
+ OUTFILE</literal> or <literal>CREATE TABLE ...
SELECT</literal>.
</para>
<para>
- As of MySQL 5.0, you can use <literal>SELECT …
+ As of MySQL 5.0, you can use <literal>SELECT ...
INTO</literal> with user-defined variables. The same syntax
can also be used inside stored routines using cursors and
local variables. See <xref linkend="select-into-statement"/>.
Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml 2006-01-30 16:53:20 UTC (rev 1130)
+++ trunk/refman-5.1/stored-procedures.xml 2006-01-30 17:17:50 UTC (rev 1131)
@@ -791,7 +791,7 @@
<remark role="help-description-begin"/>
<para>
- <literal>BEGIN … END</literal> syntax is used for writing
+ <literal>BEGIN ... END</literal> syntax is used for writing
compound statements, which can appear within stored routines and
triggers. A compound statement can contain multiple statements,
enclosed by the <literal>BEGIN</literal> and
@@ -880,8 +880,8 @@
<para>
<literal>DECLARE</literal> is allowed only inside a
- <literal>BEGIN … END</literal> compound statement and
- must be at its start, before any other statements.
+ <literal>BEGIN ... END</literal> compound statement and must be
+ at its start, before any other statements.
</para>
<para>
@@ -934,11 +934,11 @@
</para>
<para>
- The scope of a local variable is within the <literal>BEGIN
- … END</literal> block where it is declared. The
- variable can be referred to in blocks nested within the
- declaring block, except those blocks that declare a variable
- with the same name.
+ The scope of a local variable is within the <literal>BEGIN ...
+ END</literal> block where it is declared. The variable can be
+ referred to in blocks nested within the declaring block,
+ except those blocks that declare a variable with the same
+ name.
</para>
<remark role="help-description-end"/>
@@ -978,12 +978,11 @@
The <literal>SET</literal> statement in stored routines is
implemented as part of the pre-existing <literal>SET</literal>
syntax. This allows an extended syntax of <literal>SET a=x,
- b=y, …</literal> where different variable types
- (locally declared variables and global and session server
- variables) can be mixed. This also allows combinations of
- local variables and some options that make sense only for
- system variables; in that case, the options are recognized but
- ignored.
+ b=y, ...</literal> where different variable types (locally
+ declared variables and global and session server variables)
+ can be mixed. This also allows combinations of local variables
+ and some options that make sense only for system variables; in
+ that case, the options are recognized but ignored.
</para>
<remark role="help-description-end"/>
@@ -1034,7 +1033,7 @@
<para>
<emphasis role="bold">Important</emphasis>: SQL variable names
should not be the same as column names. If an SQL statement,
- such as a <literal>SELECT … INTO</literal> statement,
+ such as a <literal>SELECT ... INTO</literal> statement,
contains a reference to a column and a declared local variable
with the same name, MySQL currently interprets the reference
as the name of a variable. For example, in the following
@@ -1160,9 +1159,9 @@
<remark role="help-description-begin"/>
<para>
- The <literal>DECLARE … HANDLER</literal> statement
- specifies handlers that each may deal with one or more
- conditions. If one of these conditions occurs, the specified
+ The <literal>DECLARE ... HANDLER</literal> statement specifies
+ handlers that each may deal with one or more conditions. If
+ one of these conditions occurs, the specified
<replaceable>statement</replaceable> is executed.
<replaceable>statement</replaceable> can be a simple statement
(for example, <literal>SET <replaceable>var_name</replaceable>
@@ -1175,9 +1174,9 @@
For a <literal>CONTINUE</literal> handler, execution of the
current routine continues after execution of the handler
statement. For an <literal>EXIT</literal> handler, execution
- terminates for the <literal>BEGIN … END</literal>
- compound statement in which the handler is declared. (This is
- true even if the condition occurs in an inner block.) The
+ terminates for the <literal>BEGIN ... END</literal> compound
+ statement in which the handler is declared. (This is true even
+ if the condition occurs in an inner block.) The
<literal>UNDO</literal> handler type statement is not yet
supported.
</para>
@@ -1203,7 +1202,7 @@
<listitem>
<para>
A condition name previously specified with
- <literal>DECLARE … CONDITION</literal>. See
+ <literal>DECLARE ... CONDITION</literal>. See
<xref linkend="declare-conditions"/>.
</para>
</listitem>
@@ -1691,7 +1690,7 @@
<para>
This statement is used to exit any labeled flow control
- construct. It can be used within <literal>BEGIN …
+ construct. It can be used within <literal>BEGIN ...
END</literal> or loop constructs (<literal>LOOP</literal>,
<literal>REPEAT</literal>, <literal>WHILE</literal>).
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1131 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 30 Jan |
