Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.3026 05/07/14 15:11:34 paul@stripped +44 -0
Simplify <ulink>.
refman/tutorial.xml
1.6 05/07/14 15:11:33 paul@stripped +3 -3
Simplify <ulink>.
refman/storage-engines.xml
1.4 05/07/14 15:11:33 paul@stripped +3 -4
Simplify <ulink>.
refman/spatial-extensions-in-mysql.xml
1.3 05/07/14 15:11:33 paul@stripped +8 -9
Simplify <ulink>.
refman/problems.xml
1.5 05/07/14 15:11:33 paul@stripped +3 -3
Simplify <ulink>.
refman/porting.xml
1.2 05/07/14 15:11:33 paul@stripped +19 -23
Simplify <ulink>.
refman/ndbcluster.xml
1.7 05/07/14 15:11:33 paul@stripped +15 -19
Simplify <ulink>.
refman/mysql-optimization.xml
1.2 05/07/14 15:11:33 paul@stripped +12 -14
Simplify <ulink>.
refman/mysql-floss-license-exception.xml
1.2 05/07/14 15:11:33 paul@stripped +3 -3
Simplify <ulink>.
refman/mysql-database-administration.xml
1.27 05/07/14 15:11:33 paul@stripped +18 -18
Simplify <ulink>.
refman/mysql-apis.xml
1.7 05/07/14 15:11:33 paul@stripped +19 -22
Simplify <ulink>.
refman/maxdb.xml
1.2 05/07/14 15:11:33 paul@stripped +4 -5
Simplify <ulink>.
refman/innodb.xml
1.11 05/07/14 15:11:33 paul@stripped +67 -67
Simplify <ulink>.
refman/information-schema.xml
1.3 05/07/14 15:11:32 paul@stripped +94 -94
Simplify <ulink>.
refman/functions.xml
1.8 05/07/14 15:11:32 paul@stripped +1 -2
Simplify <ulink>.
refman/extending-mysql.xml
1.3 05/07/14 15:11:32 paul@stripped +12 -12
Simplify <ulink>.
refman-5.0/tutorial.xml
1.8 05/07/14 15:11:32 paul@stripped +3 -3
Sync.
refman-5.0/storage-engines.xml
1.7 05/07/14 15:11:32 paul@stripped +250 -253
Sync.
refman-5.0/spatial-extensions-in-mysql.xml
1.3 05/07/14 15:11:32 paul@stripped +8 -9
Sync.
refman-5.0/problems.xml
1.5 05/07/14 15:11:32 paul@stripped +3 -3
Sync.
refman-5.0/porting.xml
1.2 05/07/14 15:11:32 paul@stripped +19 -23
Sync.
refman-5.0/ndbcluster.xml
1.9 05/07/14 15:11:32 paul@stripped +15 -19
Sync.
refman-5.0/mysql-optimization.xml
1.2 05/07/14 15:11:32 paul@stripped +12 -14
Sync.
refman-5.0/mysql-floss-license-exception.xml
1.2 05/07/14 15:11:32 paul@stripped +3 -3
Sync.
refman-5.0/mysql-database-administration.xml
1.29 05/07/14 15:11:32 paul@stripped +15 -14
Sync.
refman-5.0/mysql-apis.xml
1.7 05/07/14 15:11:32 paul@stripped +19 -22
Sync.
refman-5.0/maxdb.xml
1.2 05/07/14 15:11:32 paul@stripped +4 -5
Sync.
refman-5.0/innodb.xml
1.7 05/07/14 15:11:32 paul@stripped +274 -267
Sync.
refman-5.0/information-schema.xml
1.3 05/07/14 15:11:32 paul@stripped +94 -94
Sync.
refman-5.0/functions.xml
1.13 05/07/14 15:11:32 paul@stripped +1 -2
Sync.
refman-5.0/extending-mysql.xml
1.3 05/07/14 15:11:32 paul@stripped +12 -12
Sync.
refman-4.1/tutorial.xml
1.6 05/07/14 15:11:32 paul@stripped +3 -3
Sync.
refman-4.1/storage-engines.xml
1.4 05/07/14 15:11:32 paul@stripped +3 -4
Sync.
refman-4.1/spatial-extensions-in-mysql.xml
1.3 05/07/14 15:11:32 paul@stripped +8 -9
Sync.
refman-4.1/problems.xml
1.5 05/07/14 15:11:32 paul@stripped +3 -3
Sync.
refman-4.1/porting.xml
1.2 05/07/14 15:11:32 paul@stripped +19 -23
Sync.
refman-4.1/ndbcluster.xml
1.7 05/07/14 15:11:32 paul@stripped +15 -19
Sync.
refman-4.1/mysql-optimization.xml
1.2 05/07/14 15:11:32 paul@stripped +12 -14
Sync.
refman-4.1/mysql-floss-license-exception.xml
1.2 05/07/14 15:11:32 paul@stripped +3 -3
Sync.
refman-4.1/mysql-database-administration.xml
1.19 05/07/14 15:11:31 paul@stripped +18 -18
Sync.
refman-4.1/mysql-apis.xml
1.7 05/07/14 15:11:31 paul@stripped +19 -22
Sync.
refman-4.1/maxdb.xml
1.2 05/07/14 15:11:31 paul@stripped +4 -5
Sync.
refman-4.1/innodb.xml
1.5 05/07/14 15:11:31 paul@stripped +49 -49
Sync.
refman-4.1/functions.xml
1.9 05/07/14 15:11:31 paul@stripped +1 -2
Sync.
refman-4.1/extending-mysql.xml
1.3 05/07/14 15:11:31 paul@stripped +12 -12
Sync.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: paul
# Host: kite-hub.kitebird.com
# Root: /src/extern/MySQL/bk/mysqldoc
--- 1.2/refman-4.1/extending-mysql.xml 2005-06-30 19:13:10 -05:00
+++ 1.3/refman-4.1/extending-mysql.xml 2005-07-14 15:11:31 -05:00
@@ -120,11 +120,11 @@
</indexterm>
<para>
- The test system that is included in Unix source distributions and
- binary distributions (starting with Version 3.23.29) makes it
- possible for users and developers to perform regression tests on the
- MySQL code. These tests can be run on Unix, or on Windows (using the
- Cygwin environment) if the server has been compiled under Cygwin.
+ The test system that is included in Unix source distributions and
+ binary distributions (starting with Version 3.23.29) makes it
+ possible for users and developers to perform regression tests on the
+ MySQL code. These tests can be run on Unix, or on Windows (using the
+ Cygwin environment) if the server has been compiled under Cygwin.
They cannot currently be run in a native Windows environment.
</para>
@@ -299,7 +299,7 @@
<literal>internals</literal> mailing list. See
<xref linkend="mailing-list"/>. As this list does not accept
attachments, you should ftp all the relevant files to:
- <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/>
</para></listitem>
</itemizedlist>
@@ -348,10 +348,10 @@
<command>mysql-test-run</command> with the
<literal>--debug</literal> option. If this also fails send the
trace file <filename>var/tmp/master.trace</filename> to
- <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
- so that we can examine it. Please remember to also include a full
- description of your system, the version of the
- <command>mysqld</command> binary and how you compiled it.
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> so that we
+ can examine it. Please remember to also include a full description
+ of your system, the version of the <command>mysqld</command>
+ binary and how you compiled it.
</para></listitem>
<listitem><para>
@@ -364,8 +364,8 @@
If you have compiled MySQL yourself, check our manual for how to
compile MySQL on your platform or, preferable, use one of the
binaries we have compiled for you at
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>.
- All our standard binaries should pass the test suite!
+ <ulink url="http://dev.mysql.com/downloads/"/>. All our standard
+ binaries should pass the test suite!
</para></listitem>
<listitem><para>
--- 1.8/refman-4.1/functions.xml 2005-07-08 10:50:42 -05:00
+++ 1.9/refman-4.1/functions.xml 2005-07-14 15:11:31 -05:00
@@ -2623,8 +2623,7 @@
and create an <literal>INSERT</literal> statement to update the
database with the file contents. If you are using the MySQL++
library, one way to do this can be found in the MySQL++ manual,
- available at
- <ulink url="http://dev.mysql.com/doc/">http://dev.mysql.com/doc/</ulink>.
+ available at <ulink url="http://dev.mysql.com/doc/"/>.
</para>
<para>
--- 1.4/refman-4.1/innodb.xml 2005-06-24 04:12:58 -05:00
+++ 1.5/refman-4.1/innodb.xml 2005-07-14 15:11:31 -05:00
@@ -105,7 +105,7 @@
<literal>InnoDB</literal> is published under the same GNU GPL License
Version 2 (of June 1991) as MySQL. For more information on MySQL
licensing, see
- <ulink url="http://www.mysql.com/company/legal/licensing/">http://www.mysql.com/company/legal/licensing/</ulink>.
+ <ulink url="http://www.mysql.com/company/legal/licensing/"/>.
</para>
</section>
@@ -120,7 +120,7 @@
</para>
<programlisting>
-Web site: <ulink url="http://www.innodb.com/">http://www.innodb.com/</ulink>
+Web site: <ulink url="http://www.innodb.com/"/>
Email: <email>sales@stripped</email>
Phone: +358-9-6969 3250 (office)
+358-40-5617367 (mobile)
@@ -165,8 +165,8 @@
<para>
To compile the MySQL source code with <literal>InnoDB</literal>
support, download MySQL 3.23.34a or newer from
- <ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink> and
- configure MySQL with the <literal>--with-innodb</literal> option. See
+ <ulink url="http://www.mysql.com/"/> and configure MySQL with the
+ <literal>--with-innodb</literal> option. See
<xref linkend="installing-source"/>.
</para>
@@ -943,21 +943,21 @@
<para>
This option is relevant only on Unix systems. If set to
- <literal>fdatasync</literal> (the default), <literal>InnoDB</literal> uses
- <literal>fsync()</literal> to flush both the data and log files. If
- set to <literal>O_DSYNC</literal>, <literal>InnoDB</literal> uses
- <literal>O_SYNC</literal> to open and flush the log files, but uses
- <literal>fsync()</literal> to flush the data files. If
- <literal>O_DIRECT</literal> is specified (available on some
- GNU/Linux versions starting from MySQL 4.0.14),
+ <literal>fdatasync</literal> (the default),
+ <literal>InnoDB</literal> uses <literal>fsync()</literal> to flush
+ both the data and log files. If set to <literal>O_DSYNC</literal>,
+ <literal>InnoDB</literal> uses <literal>O_SYNC</literal> to open and
+ flush the log files, but uses <literal>fsync()</literal> to flush
+ the data files. If <literal>O_DIRECT</literal> is specified
+ (available on some GNU/Linux versions starting from MySQL 4.0.14),
<literal>InnoDB</literal> uses <literal>O_DIRECT</literal> to open
the data files, and uses <literal>fsync()</literal> to flush both
the data and log files. Note that starting from MySQL 3.23.41,
<literal>InnoDB</literal> uses <literal>fsync()</literal> instead of
<literal>fdatasync()</literal>, and it does not use
- <literal>O_DSYNC</literal> by
- default because there have been problems with them on many Unix
- flavors. This option is available as of MySQL 3.23.40.
+ <literal>O_DSYNC</literal> by default because there have been
+ problems with them on many Unix flavors. This option is available as
+ of MySQL 3.23.40.
</para></listitem>
<listitem><para>
@@ -1322,8 +1322,8 @@
number of processors and disks your system has. A value of 500 or
greater disables the concurrency checking. This option is available
starting from MySQL 3.23.44 and 4.0.1. Starting with MySQL 5.0.8,
- the default value is 20, and the concurrency checking will be disabled
- if the setting is greater than or equal to 20.
+ the default value is 20, and the concurrency checking will be
+ disabled if the setting is greater than or equal to 20.
</para>
<para>
@@ -1855,8 +1855,9 @@
</para></listitem>
<listitem><para>
- If the <literal>CONSTRAINT<replaceable>symbol</replaceable></literal>
- is given, it must be unique in the database. If it is not given,
+ If the
+ <literal>CONSTRAINT<replaceable>symbol</replaceable></literal> is
+ given, it must be unique in the database. If it is not given,
<literal>InnoDB</literal> creates the name automatically.
</para></listitem>
@@ -1886,11 +1887,10 @@
parent table and automatically delete or update the matching rows
in the child table. <literal>ON DELETE CASCADE</literal> is
available starting from MySQL 3.23.50 and <literal>ON UPDATE
- CASCADE</literal> is available starting from 4.0.8.
- Between two tables,
- you should not define several <literal>ON UPDATE CASCADE</literal>
- clauses that act on the same column in the parent table or in the
- child table.
+ CASCADE</literal> is available starting from 4.0.8. Between two
+ tables, you should not define several <literal>ON UPDATE
+ CASCADE</literal> clauses that act on the same column in the parent
+ table or in the child table.
</para></listitem>
<listitem><para>
@@ -1952,9 +1952,9 @@
<para>
<literal>InnoDB</literal> needs indexes on foreign keys and
referenced keys so that foreign key checks can be fast and not
- require a table scan. Starting with MySQL 4.1.2, the index on
- the foreign key is created automatically. In older versions, the
- indexes must be created explicitly or the creation of foreign key
+ require a table scan. Starting with MySQL 4.1.2, the index on the
+ foreign key is created automatically. In older versions, the indexes
+ must be created explicitly or the creation of foreign key
constraints fails.
</para>
@@ -2030,10 +2030,10 @@
are only checked after the WHOLE SQL statement has been processed.
</para>
- <para>
- <emphasis role="bold">Note</emphasis>: Currently, triggers are not
- activated by cascaded foreign key actions.
- </para>
+ <para>
+ <emphasis role="bold">Note</emphasis>: Currently, triggers are not
+ activated by cascaded foreign key actions.
+ </para>
<para>
A simple example that relates <literal>parent</literal> and
@@ -4039,14 +4039,13 @@
<literal>TRUNCATE</literal>, <literal>UNLOCK TABLES</literal>.
</para></listitem>
- <listitem>
- <para>Before MySQL 4.0.13, <literal>CREATE TABLE</literal> commits
- if binary logging is used. Starting with MySQL 4.1.13 and MySQL
- 5.0.8, the statements <literal>CREATE TABLE</literal>,
- <literal>TRUNCATE TABLE</literal>, <literal>DROP
- DATABASE</literal>, and <literal>CREATE DATABASE</literal> cause
- an implicit commit.</para>
- </listitem>
+ <listitem><para>
+ Before MySQL 4.0.13, <literal>CREATE TABLE</literal> commits if
+ binary logging is used. Starting with MySQL 4.1.13 and MySQL 5.0.8,
+ the statements <literal>CREATE TABLE</literal>, <literal>TRUNCATE
+ TABLE</literal>, <literal>DROP DATABASE</literal>, and
+ <literal>CREATE DATABASE</literal> cause an implicit commit.
+ </para></listitem>
<listitem><para>
The <literal>CREATE TABLE</literal> statement in
@@ -6129,16 +6128,16 @@
<listitem><para>
The maximum row length, except for <literal>VARCHAR</literal>,
- <literal>BLOB</literal> and
- <literal>TEXT</literal> columns, is slightly less than half of a
- database page. That is, the maximum row length is about 8000 bytes.
- <literal>LONGBLOB</literal> and <literal>LONGTEXT</literal> columns
- must be less than 4GB, and the total row length, including also
- <literal>BLOB</literal> and <literal>TEXT</literal> columns, must be
- less than 4GB. <literal>InnoDB</literal> stores the first 768 bytes
- of a <literal>VARCHAR</literal>,
- <literal>BLOB</literal>, or <literal>TEXT</literal> column in
- the row, and the rest into separate pages.
+ <literal>BLOB</literal> and <literal>TEXT</literal> columns, is
+ slightly less than half of a database page. That is, the maximum row
+ length is about 8000 bytes. <literal>LONGBLOB</literal> and
+ <literal>LONGTEXT</literal> columns must be less than 4GB, and the
+ total row length, including also <literal>BLOB</literal> and
+ <literal>TEXT</literal> columns, must be less than 4GB.
+ <literal>InnoDB</literal> stores the first 768 bytes of a
+ <literal>VARCHAR</literal>, <literal>BLOB</literal>, or
+ <literal>TEXT</literal> column in the row, and the rest into
+ separate pages.
</para></listitem>
<listitem><para>
@@ -6371,7 +6370,8 @@
</para></listitem>
<listitem><para>
- Currently, triggers are not activated by cascaded foreign key actions.
+ Currently, triggers are not activated by cascaded foreign key
+ actions.
</para></listitem>
</itemizedlist>
--- 1.1/refman-4.1/maxdb.xml 2005-06-16 14:35:23 -05:00
+++ 1.2/refman-4.1/maxdb.xml 2005-07-14 15:11:31 -05:00
@@ -66,7 +66,7 @@
products distributed by MySQL AB. Thus, MaxDB is available under the
GNU General Public License, and a commercial license. For more
information on licensing, see
- <ulink url="http://www.mysql.com/company/legal/licensing/">http://www.mysql.com/company/legal/licensing/</ulink>.
+ <ulink url="http://www.mysql.com/company/legal/licensing/"/>.
</para>
<para>
@@ -86,10 +86,9 @@
<para>
The main page for information about MaxDB is
- <ulink url="http://www.mysql.com/products/maxdb">http://www.mysql.com/products/maxdb</ulink>.
- Information formerly available at
- <ulink url="http://www.sapdb.org">http://www.sapdb.org</ulink> has
- been moved there.
+ <ulink url="http://www.mysql.com/products/maxdb"/>. Information
+ formerly available at <ulink url="http://www.sapdb.org"/> has been
+ moved there.
</para>
</section>
--- 1.6/refman-4.1/mysql-apis.xml 2005-07-11 13:19:44 -05:00
+++ 1.7/refman-4.1/mysql-apis.xml 2005-07-14 15:11:31 -05:00
@@ -12193,11 +12193,11 @@
<para>
In the older binaries we distribute on our Web site
- (<ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink>),
- the client libraries are not normally compiled with the thread-safe
- option (the Windows binaries are by default compiled to be
- thread-safe). Newer binary distributions should have both a normal
- and a thread-safe client library.
+ (<ulink url="http://www.mysql.com/"/>), the client libraries are not
+ normally compiled with the thread-safe option (the Windows binaries
+ are by default compiled to be thread-safe). Newer binary
+ distributions should have both a normal and a thread-safe client
+ library.
</para>
<para>
@@ -12881,7 +12881,7 @@
under the GPL or a compatible license. For those who are not able
to do this, another option is to purchase a commercial license for
the MySQL code from MySQL AB. For details, please see
- <ulink url="http://www.mysql.com/company/legal/licensing/">http://www.mysql.com/company/legal/licensing/</ulink>.
+ <ulink url="http://www.mysql.com/company/legal/licensing/"/>.
</para>
</section>
@@ -12922,8 +12922,7 @@
you will likely want to configure the MySQL server to use the
<command>--old-passwords</command> option (see
<xref linkend="old-client"/>). This extension is documented on the
- PHP Website at
- <ulink url="http://php.net/mysql">http://php.net/mysql</ulink>.
+ PHP Website at <ulink url="http://php.net/mysql"/>.
</para></listitem>
<listitem><para>
@@ -12935,10 +12934,9 @@
APIs. In addition, this extension provides an advanced,
object-oriented programming interface. You can read the
documentation for the <emphasis role="bold">mysqli</emphasis>
- extension at
- <ulink url="http://php.net/mysqli">http://php.net/mysqli</ulink>. A
- helpful article can be found at
- <ulink url="http://www.zend.com/php5/articles/php5-mysqli.php">http://www.zend.com/php5/articles/php5-mysqli.php</ulink>.
+ extension at <ulink url="http://php.net/mysqli"/>. A helpful article
+ can be found at
+ <ulink url="http://www.zend.com/php5/articles/php5-mysqli.php"/>.
</para></listitem>
</itemizedlist>
@@ -13063,10 +13061,9 @@
<listitem><para>
For online information about Perl DBI, visit the DBI Web site,
- <ulink url="http://dbi.perl.org/">http://dbi.perl.org/</ulink>. That
- site hosts a general DBI mailing list. MySQL AB hosts a list
- specifically about <literal>DBD::mysql</literal>; see
- <xref linkend="mailing-list"/>.
+ <ulink url="http://dbi.perl.org/"/>. That site hosts a general DBI
+ mailing list. MySQL AB hosts a list specifically about
+ <literal>DBD::mysql</literal>; see <xref linkend="mailing-list"/>.
</para></listitem>
<listitem><para>
@@ -13074,14 +13071,14 @@
<citetitle>Programming the Perl DBI</citetitle> (Alligator Descartes
and Tim Bunce, O'Reilly & Associates, 2000). Information about
the book is available at the DBI Web site,
- <ulink url="http://dbi.perl.org/">http://dbi.perl.org/</ulink>.
+ <ulink url="http://dbi.perl.org/"/>.
</para>
<para>
For information that focuses specifically on using DBI with MySQL,
see <citetitle>MySQL and Perl for the Web</citetitle> (Paul DuBois,
New Riders, 2001). This book's Web site is
- <ulink url="http://www.kitebird.com/mysql-perl/">http://www.kitebird.com/mysql-perl/</ulink>.
+ <ulink url="http://www.kitebird.com/mysql-perl/"/>.
</para></listitem>
</itemizedlist>
@@ -13103,7 +13100,7 @@
<para>
<literal>MySQL++</literal> is a MySQL API for C++. Warren Young has
taken over this project. More information can be found at
- <ulink url="http://www.mysql.com/products/mysql++/">http://www.mysql.com/products/mysql++/</ulink>.
+ <ulink url="http://www.mysql.com/products/mysql++/"/>.
</para>
<section id="borland-c-plus-plus">
@@ -13145,7 +13142,7 @@
<para>
<literal>MySQLdb</literal> provides MySQL support for Python,
compliant with the Python DB API version 2.0. It can be found at
- <ulink url="http://sourceforge.net/projects/mysql-python/">http://sourceforge.net/projects/mysql-python/</ulink>.
+ <ulink url="http://sourceforge.net/projects/mysql-python/"/>.
</para>
</section>
@@ -13161,7 +13158,7 @@
<para>
<literal>MySQLtcl</literal> is a simple API for accessing a MySQL
database server from the Tcl programming language. It can be found at
- <ulink url="http://www.xdobry.de/mysqltcl/">http://www.xdobry.de/mysqltcl/</ulink>.
+ <ulink url="http://www.xdobry.de/mysqltcl/"/>.
</para>
</section>
@@ -13183,7 +13180,7 @@
Eiffel MySQL is an interface to the MySQL database server using the
Eiffel programming language, written by Michael Ravits. It can be
found at
- <ulink url="http://efsa.sourceforge.net/archive/ravits/mysql.htm">http://efsa.sourceforge.net/archive/ravits/mysql.htm</ulink>.
+ <ulink url="http://efsa.sourceforge.net/archive/ravits/mysql.htm"/>.
</para>
</section>
--- 1.18/refman-4.1/mysql-database-administration.xml 2005-07-13 09:39:45 -05:00
+++ 1.19/refman-4.1/mysql-database-administration.xml 2005-07-14 15:11:31 -05:00
@@ -217,8 +217,8 @@
<para>
The MySQL bug reporting script. It can be used to send a bug report
to the MySQL mailing list. (You can also visit
- <ulink url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>
- to file a bug report online. See <xref linkend="bug-reports"/>.)
+ <ulink url="http://bugs.mysql.com/"/> to file a bug report online.
+ See <xref linkend="bug-reports"/>.)
</para></listitem>
</itemizedlist>
@@ -253,8 +253,8 @@
server (<literal>mysqld.exe</literal>) and the MySQL-Max server
(<command>mysqld-max.exe</command>), so you need not get a special
distribution. Just use a regular Windows distribution, available at
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>.
- See <xref linkend="windows-installation"/>.
+ <ulink url="http://dev.mysql.com/downloads/"/>. See
+ <xref linkend="windows-installation"/>.
</para></listitem>
<listitem><para>
@@ -278,7 +278,7 @@
<para>
You can find the MySQL-Max binaries on the MySQL AB Web site at
- <ulink url="http://dev.mysql.com/downloads/mysql-4.0.html">http://dev.mysql.com/downloads/mysql-4.0.html</ulink>.
+ <ulink url="http://dev.mysql.com/downloads/mysql-4.0.html"/>.
</para>
<para>
@@ -10709,9 +10709,8 @@
connection even more secure, you should use SSH to get an encrypted
TCP/IP connection between a MySQL server and a MySQL client. You can
find an Open Source SSH client at
- <ulink url="http://www.openssh.org/">http://www.openssh.org/</ulink>,
- and a commercial SSH client at
- <ulink url="http://www.ssh.com/">http://www.ssh.com/</ulink>.
+ <ulink url="http://www.openssh.org/"/>, and a commercial SSH client
+ at <ulink url="http://www.ssh.com/"/>.
</para>
<para>
@@ -16482,7 +16481,7 @@
<listitem><para>
Install the OpenSSL library. We have tested MySQL with OpenSSL
0.9.6. If you need OpenSSL, visit
- <ulink url="http://www.openssl.org">http://www.openssl.org</ulink>.
+ <ulink url="http://www.openssl.org"/>.
</para></listitem>
<listitem><para>
@@ -17050,11 +17049,11 @@
<para>
Install an SSH client on your Windows machine. As a user, the best
non-free one I've found is from <literal>SecureCRT</literal> from
- <ulink url="http://www.vandyke.com/">http://www.vandyke.com/</ulink>.
- Another option is <literal>f-secure</literal> from
- <ulink url="http://www.f-secure.com/">http://www.f-secure.com/</ulink>.
- You can also find some free ones on <literal>Google</literal> at
- <ulink url="http://directory.google.com/Top/Computers/Security/Products_and_Tools/Cryptography/SSH/Clients/Windows/">http://directory.google.com/Top/Computers/Security/Products_and_Tools/Cryptography/SSH/Clients/Windows/</ulink>.
+ <ulink url="http://www.vandyke.com/"/>. Another option is
+ <literal>f-secure</literal> from
+ <ulink url="http://www.f-secure.com/"/>. You can also find some
+ free ones on <literal>Google</literal> at
+ <ulink url="http://directory.google.com/Top/Computers/Security/Products_and_Tools/Cryptography/SSH/Clients/Windows/"/>.
</para></listitem>
<listitem><para>
@@ -21038,8 +21037,8 @@
If your system doesn't have a zoneinfo database (for example,
Windows or HP-UX), you can use the package of pre-built time zone
tables that is available for download at
- <ulink url="http://dev.mysql.com/downloads/timezones.html">http://dev.mysql.com/downloads/timezones.html</ulink>.
- This package contains <filename>.frm</filename>,
+ <ulink url="http://dev.mysql.com/downloads/timezones.html"/>. This
+ package contains <filename>.frm</filename>,
<filename>.MYD</filename>, and <filename>.MYI</filename> files for
the <literal>MyISAM</literal> time zone tables. These tables should
belong to the <literal>mysql</literal> database, so you should place
@@ -23257,10 +23256,11 @@
<para>
When setting <literal>query_cache_size</literal> to a non-zero value
keep in mind that the query cache needs a minimum size of about 40KB
- to allocate its structures. (The exact size depends on
+ to allocate its structures. (The exact size depends on
architecture.) If you set the value too small, you'll get a warning,
like in this example:
- <programlisting>
+
+<programlisting>
mysql> <userinput>SET GLOBAL query_cache_size = 40000;</userinput>
Query OK, 0 rows affected, 1 warning (0.00 sec)
--- 1.1/refman-4.1/mysql-floss-license-exception.xml 2005-06-16 14:35:23 -05:00
+++ 1.2/refman-4.1/mysql-floss-license-exception.xml 2005-07-14 15:11:32 -05:00
@@ -300,10 +300,10 @@
Due to the many variants of some of the above licenses, we require
that any version follow the 2003 version of the Free Software
Foundation's Free Software Definition
- (<ulink url="http://www.gnu.org/philosophy/free-sw.html">http://www.gnu.org/philosophy/free-sw.html</ulink>)
- or version 1.9 of the Open Source Definition by the Open Source
+ (<ulink url="http://www.gnu.org/philosophy/free-sw.html"/>) or
+ version 1.9 of the Open Source Definition by the Open Source
Initiative
- (<ulink url="http://www.opensource.org/docs/definition.php">http://www.opensource.org/docs/definition.php</ulink>).
+ (<ulink url="http://www.opensource.org/docs/definition.php"/>).
</para></listitem>
<listitem><para>
--- 1.1/refman-4.1/mysql-optimization.xml 2005-06-16 14:35:23 -05:00
+++ 1.2/refman-4.1/mysql-optimization.xml 2005-07-14 15:11:32 -05:00
@@ -212,10 +212,9 @@
<para>
For <literal>crash-me</literal> results, visit
- <ulink url="http://dev.mysql.com/tech-resources/crash-me.php">http://dev.mysql.com/tech-resources/crash-me.php</ulink>.
- See
- <ulink url="http://dev.mysql.com/tech-resources/benchmarks/">http://dev.mysql.com/tech-resources/benchmarks/</ulink>
- for the results from the benchmarks.
+ <ulink url="http://dev.mysql.com/tech-resources/crash-me.php"/>. See
+ <ulink url="http://dev.mysql.com/tech-resources/benchmarks/"/> for
+ the results from the benchmarks.
</para>
<para>
@@ -402,8 +401,8 @@
<listitem><para>
The benchmark suite is provided with MySQL source distributions.
You can either download a released distribution from
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>,
- or use the current development source tree (see
+ <ulink url="http://dev.mysql.com/downloads/"/>, or use the current
+ development source tree (see
<xref linkend="installing-source-tree"/>).
</para></listitem>
@@ -481,9 +480,9 @@
<para>
You can find the results from <literal>crash-me</literal> for many
different database servers at
- <ulink url="http://dev.mysql.com/tech-resources/crash-me.php">http://dev.mysql.com/tech-resources/crash-me.php</ulink>.
- For more information about benchmark results, visit
- <ulink url="http://dev.mysql.com/tech-resources/benchmarks/">http://dev.mysql.com/tech-resources/benchmarks/</ulink>.
+ <ulink url="http://dev.mysql.com/tech-resources/crash-me.php"/>. For
+ more information about benchmark results, visit
+ <ulink url="http://dev.mysql.com/tech-resources/benchmarks/"/>.
</para>
</section>
@@ -521,8 +520,7 @@
<para>
Another free benchmark suite is the Open Source Database Benchmark,
- available at
- <ulink url="http://osdb.sourceforge.net/">http://osdb.sourceforge.net/</ulink>.
+ available at <ulink url="http://osdb.sourceforge.net/"/>.
</para>
<para>
@@ -541,9 +539,9 @@
To avoid problems like this, you should put some effort into
benchmarking your whole application under the worst possible load!
You can use Super Smack for this. It is available at
- <ulink url="http://jeremy.zawodny.com/mysql/super-smack/">http://jeremy.zawodny.com/mysql/super-smack/</ulink>.
- As the name suggests, it can bring a system to its knees if you ask
- it, so make sure to use it only on your development systems.
+ <ulink url="http://jeremy.zawodny.com/mysql/super-smack/"/>. As the
+ name suggests, it can bring a system to its knees if you ask it, so
+ make sure to use it only on your development systems.
</para>
</section>
--- 1.6/refman-4.1/ndbcluster.xml 2005-06-28 00:19:26 -05:00
+++ 1.7/refman-4.1/ndbcluster.xml 2005-07-14 15:11:32 -05:00
@@ -52,8 +52,7 @@
This chapter represents a work in progress, and its contents are
subject to revision as MySQL Cluster continues to evolve. Additional
information regarding MySQL Cluster can be found on the MySQL AB Web
- site at
- <ulink url="http://www.mysql.com/products/cluster/">http://www.mysql.com/products/cluster/</ulink>.
+ site at <ulink url="http://www.mysql.com/products/cluster/"/>.
</para>
<para>
@@ -64,8 +63,8 @@
<itemizedlist>
<listitem><para>
- the MySQL Cluster
- <ulink url="mailing list">http://lists.mysql.com/cluster</ulink>.
+ the MySQL Cluster <ulink url="http://lists.mysql.com/cluster">mailing
+ list</ulink>.
</para></listitem>
<listitem><para>
@@ -309,11 +308,11 @@
<title id='title-multi-computer'>&title-multi-computer;</title>
<para>
- This section is a "How-To" in which we describe the basics for
- how to plan, install, configure, and run a viable MySQL Cluster.
- Unlike the example in <xref linkend="mysql-cluster-configuration"/>,
- the result of following the guidelines and procedures outlined below
- should be a usable MySQL Cluster which meets minimum requirements for
+ This section is a "How-To" in which we describe the basics for how to
+ plan, install, configure, and run a viable MySQL Cluster. Unlike the
+ example in <xref linkend="mysql-cluster-configuration"/>, the result
+ of following the guidelines and procedures outlined below should be a
+ usable MySQL Cluster which meets minimum requirements for
availability and safeguarding of data.
</para>
@@ -494,8 +493,7 @@
merely to be able to use Cluster. In this How-To, we will assume
that you are using the <literal>-max</literal> binary appropriate to
your operating system, available via the MySQL software downloads
- page at
- <ulink url="http://dev.mysql.com/downloads">http://dev.mysql.com/downloads</ulink>.
+ page at <ulink url="http://dev.mysql.com/downloads"/>.
</para>
<para>
@@ -874,9 +872,8 @@
<para>
(<emphasis role="bold">NOTE</emphasis>: The "world" database can be
- downloaded from
- <ulink url="http://dev.mysql.com/doc/">http://dev.mysql.com/doc/</ulink>
- where it can be found listed under "Examples".)
+ downloaded from <ulink url="http://dev.mysql.com/doc/"/> where it
+ can be found listed under "Examples".)
</para>
<para>
@@ -1980,8 +1977,8 @@
Prior to MySQL 4.1.8, the default port was 2200.) This port should
always be available on the network, since it has been assigned by
IANA for this purpose (see
- <ulink url="http://www.iana.org/assignments/port-numbers">http://www.iana.org/assignments/port-numbers</ulink>
- for details).
+ <ulink url="http://www.iana.org/assignments/port-numbers"/> for
+ details).
</para>
<para>
@@ -7846,9 +7843,8 @@
there are no plans to address these in coming releases of 4.1;
however, we will attempt to supply fixes for these issues in MySQL
5.0 and subsequent releases. If you check the Cluster category in the
- MySQL bugs database at
- <ulink url="http://bugs.mysql.com">http://bugs.mysql.com</ulink>, you
- can find known bugs which (if marked 4.1) we intend to correct in
+ MySQL bugs database at <ulink url="http://bugs.mysql.com"/>, you can
+ find known bugs which (if marked 4.1) we intend to correct in
upcoming releases of MySQL 4.1.
</para>
--- 1.1/refman-4.1/porting.xml 2005-06-16 14:35:23 -05:00
+++ 1.2/refman-4.1/porting.xml 2005-07-14 15:11:32 -05:00
@@ -21,8 +21,8 @@
check the list of currently supported operating systems first. See
<xref linkend="which-os"/>. If you have created a new port of MySQL,
please let us know so that we can list it here and on our Web site
- (<ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink>),
- recommending it to other users.
+ (<ulink url="http://www.mysql.com/"/>), recommending it to other
+ users.
</para>
<para>
@@ -42,25 +42,24 @@
The hard part of porting to a new Unix variant without good native
thread support is probably to port MIT-pthreads. See
<filename>mit-pthreads/README</filename> and Programming POSIX Threads
- (<ulink url="http://www.humanfactor.com/pthreads/">http://www.humanfactor.com/pthreads/</ulink>).
+ (<ulink url="http://www.humanfactor.com/pthreads/"/>).
</para>
<para>
Up to MySQL 4.0.2, the MySQL distribution included a patched version
of Chris Provenzano's Pthreads from MIT (see the MIT Pthreads Web page
- at
- <ulink url="http://www.mit.edu/afs/sipb/project/pthreads/">http://www.mit.edu/afs/sipb/project/pthreads/</ulink>
- and a programming introduction at
- <ulink url="http://www.mit.edu:8001/people/proven/IAP_2000/">http://www.mit.edu:8001/people/proven/IAP_2000/</ulink>).
- These can be used for some operating systems that do not have POSIX
- threads. See <xref linkend="mit-pthreads"/>.
+ at <ulink url="http://www.mit.edu/afs/sipb/project/pthreads/"/> and a
+ programming introduction at
+ <ulink url="http://www.mit.edu:8001/people/proven/IAP_2000/"/>). These
+ can be used for some operating systems that do not have POSIX threads.
+ See <xref linkend="mit-pthreads"/>.
</para>
<para>
It is also possible to use another user level thread package named FSU
Pthreads (see
- <ulink url="http://moss.csc.ncsu.edu/~mueller/pthreads/">http://moss.csc.ncsu.edu/~mueller/pthreads/</ulink>).
- This implementation is being used for the SCO port.
+ <ulink url="http://moss.csc.ncsu.edu/~mueller/pthreads/"/>). This
+ implementation is being used for the SCO port.
</para>
<para>
@@ -341,8 +340,8 @@
the trace file to the appropriate mailing list where something seems
to go wrong! If you can't locate the wrong place, you can ftp the
trace file, together with a full bug report, to
- <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
- so that a MySQL developer can take a look a this.
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> so that a MySQL
+ developer can take a look a this.
</para>
<para>
@@ -681,8 +680,8 @@
If this doesn't help and you can't find anything in the
<literal>mysql</literal> mail archive, you should report the bug to
a MySQL mailing list. The mailing lists are described at
- <ulink url="http://lists.mysql.com/">http://lists.mysql.com/</ulink>,
- which also has links to online list archives.
+ <ulink url="http://lists.mysql.com/"/>, which also has links to
+ online list archives.
</para>
<para>
@@ -781,14 +780,11 @@
<command>mysqld</command> to die with the above command, you 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/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
- and enter it into our bugs system at
- <ulink url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>.
- If you are a support customer, you can use the MySQL Customer
- Support Center
- <ulink url="https://support.mysql.com/">https://support.mysql.com/</ulink>
- to alert the MySQL team about the problem and have it fixed as soon
- as possible.
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> and enter it
+ into our bugs system at <ulink url="http://bugs.mysql.com/"/>. If
+ you are a support customer, you can use the MySQL Customer Support
+ Center <ulink url="https://support.mysql.com/"/> to alert the MySQL
+ team about the problem and have it fixed as soon as possible.
</para></listitem>
</itemizedlist>
--- 1.4/refman-4.1/problems.xml 2005-07-09 10:37:17 -05:00
+++ 1.5/refman-4.1/problems.xml 2005-07-14 15:11:32 -05:00
@@ -537,7 +537,7 @@
configuration of MySQL need be done in order to use this newer MySQL
client library for PHP. For more information about the
<literal>mysqli</literal> extension, see
- <ulink url="http://php.net/mysqli">http://php.net/mysqli</ulink>.
+ <ulink url="http://php.net/mysqli"/>.
</para>
<para>
@@ -4248,8 +4248,8 @@
</para></listitem>
<listitem><para>
- When inserting a big integer value (between 2^63 and 2^64−1) into a
- decimal or string column, it is inserted as a negative value
+ When inserting a big integer value (between 2^63 and 2^64−1) into
+ a decimal or string column, it is inserted as a negative value
because the number is evaluated in a signed integer context.
</para></listitem>
--- 1.2/refman-4.1/spatial-extensions-in-mysql.xml 2005-07-13 20:02:53 -05:00
+++ 1.3/refman-4.1/spatial-extensions-in-mysql.xml 2005-07-14 15:11:32 -05:00
@@ -74,18 +74,17 @@
universities participating in the development of publicly available
conceptual solutions that can be useful with all kinds of
applications that manage spatial data. The OGC maintains a Web site
- at
- <ulink url="http://www.opengis.org/">http://www.opengis.org/</ulink>.
+ at <ulink url="http://www.opengis.org/"/>.
</para>
<para>
- In 1997, the Open GIS Consortium published the <citetitle>OpenGIS®
- Simple Features Specifications For SQL</citetitle>, a document that
- proposes several conceptual ways for extending an SQL RDBMS to
- support spatial data. This specification is available from the Open
- GIS Web site at
- <ulink url="http://www.opengis.org/docs/99-049.pdf">http://www.opengis.org/docs/99-049.pdf</ulink>.
- It contains additional information relevant to this chapter.
+ In 1997, the Open GIS Consortium published the
+ <citetitle>OpenGIS® Simple Features Specifications For
+ SQL</citetitle>, a document that proposes several conceptual ways for
+ extending an SQL RDBMS to support spatial data. This specification is
+ available from the Open GIS Web site at
+ <ulink url="http://www.opengis.org/docs/99-049.pdf"/>. It contains
+ additional information relevant to this chapter.
</para>
<para>
--- 1.3/refman-4.1/storage-engines.xml 2005-06-29 05:05:30 -05:00
+++ 1.4/refman-4.1/storage-engines.xml 2005-07-14 15:11:32 -05:00
@@ -1846,8 +1846,8 @@
<listitem><para>
<literal>MEMORY</literal> tables allow up to 32 indexes per table
and 16 columns per index. Previously, the maximum key length
- supported by this storage engine was 255 bytes; as of MySQL 4.1.13,
- <literal>MEMORY</literal> tables support a maximum key length of 500
+ supported by this storage engine was 255 bytes; as of MySQL 4.1.13,
+ <literal>MEMORY</literal> tables support a maximum key length of 500
bytes. (See <xref linkend="news-4-1-3"/>.)
</para></listitem>
@@ -2079,8 +2079,7 @@
<para>
For general information about Berkeley DB, please visit the Sleepycat
- Web site,
- <ulink url="http://www.sleepycat.com/">http://www.sleepycat.com/</ulink>.
+ Web site, <ulink url="http://www.sleepycat.com/"/>.
</para>
<section id="bdb-portability">
--- 1.5/refman-4.1/tutorial.xml 2005-07-12 13:37:24 -05:00
+++ 1.6/refman-4.1/tutorial.xml 2005-07-14 15:11:32 -05:00
@@ -620,9 +620,9 @@
some of the queries and sample data used in the following sections
can be obtained from the MySQL Web site. It's available in either
compressed <command>tar</command> format
- (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.tar.gz">http://www.mysql.com/Downloads/Contrib/Examples/menagerie.tar.gz</ulink>)
+ (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.tar.gz"/>)
or Zip format
- (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.zip">http://www.mysql.com/Downloads/Contrib/Examples/menagerie.zip</ulink>).
+ (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.zip"/>).
</para>
<para>
@@ -3942,7 +3942,7 @@
<para>
More information about Twin studies can be found at:
- <ulink url="http://www.mep.ki.se/twinreg/index_en.html">http://www.mep.ki.se/twinreg/index_en.html</ulink>
+ <ulink url="http://www.mep.ki.se/twinreg/index_en.html"/>
</para>
<para>
--- 1.2/refman-5.0/extending-mysql.xml 2005-06-30 19:13:10 -05:00
+++ 1.3/refman-5.0/extending-mysql.xml 2005-07-14 15:11:32 -05:00
@@ -120,11 +120,11 @@
</indexterm>
<para>
- The test system that is included in Unix source distributions and
- binary distributions makes it possible for users and developers to
- perform regression tests on the MySQL code. These tests can be run
- on Unix, or on Windows (using the Cygwin environment) if the server
- has been compiled under Cygwin. They cannot currently be run in a
+ The test system that is included in Unix source distributions and
+ binary distributions makes it possible for users and developers to
+ perform regression tests on the MySQL code. These tests can be run
+ on Unix, or on Windows (using the Cygwin environment) if the server
+ has been compiled under Cygwin. They cannot currently be run in a
native Windows environment.
</para>
@@ -299,7 +299,7 @@
<literal>internals</literal> mailing list. See
<xref linkend="mailing-list"/>. As this list does not accept
attachments, you should ftp all the relevant files to:
- <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/>
</para></listitem>
</itemizedlist>
@@ -348,10 +348,10 @@
<command>mysql-test-run</command> with the
<literal>--debug</literal> option. If this also fails send the
trace file <filename>var/tmp/master.trace</filename> to
- <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
- so that we can examine it. Please remember to also include a full
- description of your system, the version of the
- <command>mysqld</command> binary and how you compiled it.
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> so that we
+ can examine it. Please remember to also include a full description
+ of your system, the version of the <command>mysqld</command>
+ binary and how you compiled it.
</para></listitem>
<listitem><para>
@@ -364,8 +364,8 @@
If you have compiled MySQL yourself, check our manual for how to
compile MySQL on your platform or, preferable, use one of the
binaries we have compiled for you at
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>.
- All our standard binaries should pass the test suite!
+ <ulink url="http://dev.mysql.com/downloads/"/>. All our standard
+ binaries should pass the test suite!
</para></listitem>
<listitem><para>
--- 1.12/refman-5.0/functions.xml 2005-07-08 12:37:21 -05:00
+++ 1.13/refman-5.0/functions.xml 2005-07-14 15:11:32 -05:00
@@ -2577,8 +2577,7 @@
and create an <literal>INSERT</literal> statement to update the
database with the file contents. If you are using the MySQL++
library, one way to do this can be found in the MySQL++ manual,
- available at
- <ulink url="http://dev.mysql.com/doc/">http://dev.mysql.com/doc/</ulink>.
+ available at <ulink url="http://dev.mysql.com/doc/"/>.
</para>
-->
--- 1.2/refman-5.0/information-schema.xml 2005-06-30 06:39:16 -05:00
+++ 1.3/refman-5.0/information-schema.xml 2005-07-14 15:11:32 -05:00
@@ -226,8 +226,9 @@
</para></listitem>
<listitem><para>
- ``Remarks'' provides additional information where applicable.
- <!-- We have marked ``omit'' those columns for which MySQL has no present
+ ``Remarks'' provides additional information where applicable.
+
+<!-- We have marked ``omit'' those columns for which MySQL has no present
use. We have omitted these columns, that is, they appear in the
standard but not in MySQL. So their presence here is a matter of
record only. -->
@@ -242,7 +243,7 @@
<literal>COLLATION</literal> to <literal>TABLE_COLLATION</literal> in
the <literal>TABLES</literal> table.) See the list of reserved words
near the end of this article:
- <ulink url="http://www.dbazine.com/gulutzan5.shtml">http://www.dbazine.com/gulutzan5.shtml</ulink>.
+ <ulink url="http://www.dbazine.com/gulutzan5.shtml"/>.
</para>
<para>
@@ -317,7 +318,7 @@
Database
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>SCHEMA_OWNER</literal>
@@ -328,7 +329,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>DEFAULT_CHARACTER_SET_CATALOG</literal>
@@ -339,7 +340,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>DEFAULT_CHARACTER_SET_SCHEMA</literal>
@@ -476,7 +477,7 @@
<entry/>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>SELF_REFERENCING_COLUMN_NAME</literal>
@@ -487,7 +488,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>REFERENCE_GENERATION</literal>
@@ -498,7 +499,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>USER_DEFINED_TYPE_NAME</literal>
@@ -509,7 +510,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_INSERTABLE_INTO</literal>
@@ -520,7 +521,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_TYPED</literal>
@@ -531,7 +532,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COMMIT_ACTION</literal>
@@ -911,7 +912,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>NUMERIC_PRECISION_RADIX</literal>
@@ -931,7 +932,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>DATETIME_PRECISION</literal>
@@ -942,7 +943,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>INTERVAL_TYPE</literal>
@@ -953,7 +954,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>INTERVAL_PRECISION</literal>
@@ -964,7 +965,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_CATALOG</literal>
@@ -975,7 +976,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_SCHEMA</literal>
@@ -991,10 +992,9 @@
<literal>CHARACTER_SET_NAME</literal>
</entry>
<entry/>
- <entry>
- </entry>
+ <entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_CATALOG</literal>
@@ -1005,7 +1005,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_SCHEMA</literal>
@@ -1025,7 +1025,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>DOMAIN_NAME</literal>
@@ -1036,7 +1036,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>UDT_CATALOG</literal>
@@ -1047,7 +1047,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>UDT_SCHEMA</literal>
@@ -1058,7 +1058,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>UDT_NAME</literal>
@@ -1069,7 +1069,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>SCOPE_CATALOG</literal>
@@ -1080,7 +1080,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>SCOPE_SCHEMA</literal>
@@ -1091,7 +1091,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>SCOPE_NAME</literal>
@@ -1102,7 +1102,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>MAXIMUM_CARDINALITY</literal>
@@ -1113,7 +1113,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>DTD_IDENTIFIER</literal>
@@ -1124,7 +1124,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_SELF_REFERENCING</literal>
@@ -1135,7 +1135,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_IDENTITY</literal>
@@ -1146,7 +1146,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_GENERATION</literal>
@@ -1157,7 +1157,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_START</literal>
@@ -1168,7 +1168,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_INCREMENT</literal>
@@ -1179,7 +1179,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_MAXIMUM</literal>
@@ -1190,7 +1190,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_MINIMUM</literal>
@@ -1201,7 +1201,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_CYCLE</literal>
@@ -1212,7 +1212,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_GENERATED</literal>
@@ -1223,7 +1223,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>GENERATION_EXPRESSION</literal>
@@ -1412,7 +1412,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>TYPE</literal>
@@ -1459,7 +1459,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>PAGES</literal>
@@ -1470,7 +1470,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>FILTER_CONDITION</literal>
@@ -1787,7 +1787,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>GRANTOR</literal>
@@ -1844,7 +1844,7 @@
<entry/>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>WITH_HIERARCHY</literal>
@@ -1912,7 +1912,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>GRANTOR</literal>
@@ -2054,7 +2054,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_CATALOG</literal>
@@ -2065,7 +2065,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_SCHEMA</literal>
@@ -2085,7 +2085,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_REPERTOIRE</literal>
@@ -2096,7 +2096,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>FORM_OF_USE</literal>
@@ -2107,7 +2107,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>NUMBER_OF_CHARACTERS</literal>
@@ -2118,7 +2118,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>DEFAULT_COLLATE_CATALOG</literal>
@@ -2129,7 +2129,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>DEFAULT_COLLATE_SCHEMA</literal>
@@ -2235,7 +2235,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_CATALOG</literal>
@@ -2246,7 +2246,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_SCHEMA</literal>
@@ -2266,7 +2266,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>PAD_ATTRIBUTE</literal>
@@ -2277,7 +2277,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_TYPE</literal>
@@ -2288,7 +2288,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_DEFINITION</literal>
@@ -2299,7 +2299,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_DICTIONARY</literal>
@@ -2310,7 +2310,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_NAME</literal>
@@ -2321,7 +2321,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>ID</literal>
@@ -2332,7 +2332,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_DEFAULT</literal>
@@ -2343,7 +2343,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_COMPILED</literal>
@@ -2354,7 +2354,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>SORTLEN</literal>
@@ -2433,7 +2433,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_CATALOG</literal>
@@ -2444,7 +2444,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_SCHEMA</literal>
@@ -2464,7 +2464,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_CATALOG</literal>
@@ -2475,7 +2475,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_SCHEMA</literal>
@@ -2556,7 +2556,7 @@
<entry/>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>TABLE_CATALOG</literal>
@@ -2588,7 +2588,7 @@
<entry/>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>IS_DEFERRABLE</literal>
@@ -2599,7 +2599,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>INITIALLY_DEFERRED</literal>
@@ -2895,7 +2895,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>SPECIFIC_CATALOG</literal>
@@ -2906,7 +2906,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>SPECIFIC_SCHEMA</literal>
@@ -2955,7 +2955,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>MODULE_CATALOG</literal>
@@ -2966,7 +2966,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>MODULE_SCHEMA</literal>
@@ -2977,7 +2977,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>MODULE_NAME</literal>
@@ -2988,7 +2988,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>USER_DEFINED_TYPE_CATALOG</literal>
@@ -2999,7 +2999,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>USER_DEFINED_TYPE_SCHEMA</literal>
@@ -3010,7 +3010,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>USER_DEFINED_TYPE_NAME</literal>
@@ -3106,7 +3106,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>IS_NULL_CALL</literal>
@@ -3126,7 +3126,7 @@
<literal>NULL</literal>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>SCHEMA_LEVEL_ROUTINE</literal>
@@ -3137,7 +3137,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>MAX_DYNAMIC_RESULT_SETS</literal>
@@ -3148,7 +3148,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_USER_DEFINED_CAST</literal>
@@ -3159,7 +3159,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_IMPLICITLY_INVOCABLE</literal>
@@ -3179,7 +3179,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>TO_SQL_SPECIFIC_CATALOG</literal>
@@ -3190,7 +3190,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>TO_SQL_SPECIFIC_SCHEMA</literal>
@@ -3201,7 +3201,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>TO_SQL_SPECIFIC_NAME</literal>
@@ -3212,7 +3212,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>AS_LOCATOR</literal>
@@ -3241,7 +3241,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>NEW_SAVEPOINT_LEVEL</literal>
@@ -3252,7 +3252,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_UDT_DEPENDENT</literal>
@@ -3263,7 +3263,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>RESULT_CAST_FROM_DTD_IDENTIFIER</literal>
@@ -3274,7 +3274,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>RESULT_CAST_AS_LOCATOR</literal>
@@ -3427,7 +3427,7 @@
<entry/>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>INSERTABLE_INTO</literal>
--- 1.6/refman-5.0/innodb.xml 2005-07-11 06:05:14 -05:00
+++ 1.7/refman-5.0/innodb.xml 2005-07-14 15:11:32 -05:00
@@ -84,8 +84,8 @@
</para>
<para>
- In MySQL 5.0, <literal>InnoDB</literal> is included in binary
- distributions by default. The Windows Essentials installer makes
+ In MySQL 5.0, <literal>InnoDB</literal> is included in binary
+ distributions by default. The Windows Essentials installer makes
<literal>InnoDB</literal> the MySQL default table type on Windows.
</para>
@@ -102,7 +102,7 @@
<literal>InnoDB</literal> is published under the same GNU GPL License
Version 2 (of June 1991) as MySQL. For more information on MySQL
licensing, see
- <ulink url="http://www.mysql.com/company/legal/licensing/">http://www.mysql.com/company/legal/licensing/</ulink>.
+ <ulink url="http://www.mysql.com/company/legal/licensing/"/>.
</para>
</section>
@@ -117,7 +117,7 @@
</para>
<programlisting>
-Web site: <ulink url="http://www.innodb.com/">http://www.innodb.com/</ulink>
+Web site: <ulink url="http://www.innodb.com/"/>
Email: <email>sales@stripped</email>
Phone: +358-9-6969 3250 (office)
+358-40-5617367 (mobile)
@@ -137,10 +137,10 @@
<title id='title-innodb-configuration'>&title-innodb-configuration;</title>
<para>
- In MySQL 5.0, the <literal>InnoDB</literal> storage engine is
- enabled by default. If you don't want to use
- <literal>InnoDB</literal> tables, you can add the
- <literal>skip-innodb</literal> option to your MySQL option file.
+ In MySQL 5.0, the <literal>InnoDB</literal> storage engine is enabled
+ by default. If you don't want to use <literal>InnoDB</literal>
+ tables, you can add the <literal>skip-innodb</literal> option to your
+ MySQL option file.
</para>
<para>
@@ -334,7 +334,7 @@
example.</emphasis> Suppose that you have a computer with 128MB RAM
and one hard disk. The following example shows possible configuration
parameters in <filename>my.cnf</filename> or
- <filename>my.ini</filename> for <literal>InnoDB</literal>, including
+ <filename>my.ini</filename> for <literal>InnoDB</literal>, including
the <literal>autoextend</literal> attribute.
</para>
@@ -445,8 +445,8 @@
</para></listitem>
<listitem><para>
- If you installed MySQL the installation and configuration wizards,
- the <filename>my.ini</filename> file is located in your MySQL
+ If you installed MySQL the installation and configuration wizards,
+ the <filename>my.ini</filename> file is located in your MySQL
installation directory. See
<xref linkend="mysql-config-wizard-file-location"/>.
</para></listitem>
@@ -589,7 +589,7 @@
</para>
<para>
- By compiling MySQL yourself, you can use up to 64GB of physical
+ By compiling MySQL yourself, you can use up to 64GB of physical
memory in 32-bit Windows. See the description for
<literal>innodb_buffer_pool_awe_mem_mb</literal> in
<xref linkend="innodb-start"/>.
@@ -654,7 +654,7 @@
<para>
The increment size (in megabytes) for extending the size of an
autoextending tablespace when it becomes full. The default value is
- 8. This option can be changed at runtime as a global system
+ 8. This option can be changed at runtime as a global system
variable.
</para></listitem>
@@ -664,12 +664,12 @@
<para>
The size of the buffer pool (in MB), if it is placed in the AWE
- memory of 32-bit Windows. (Relevant only in 32-bit Windows.) If your
+ memory of 32-bit Windows. (Relevant only in 32-bit Windows.) If your
32-bit Windows operating system supports more than 4GB memory, using
- so-called ``Address Windowing Extensions,'' you can allocate the
- <literal>InnoDB</literal> buffer pool into the AWE physical memory
- using this parameter. The maximum possible value for this is 64000.
- If this parameter is specified,
+ so-called ``Address Windowing Extensions,'' you can allocate the
+ <literal>InnoDB</literal> buffer pool into the AWE physical memory
+ using this parameter. The maximum possible value for this is 64000.
+ If this parameter is specified,
<literal>innodb_buffer_pool_size</literal> is the window in the
32-bit address space of <command>mysqld</command> where
<literal>InnoDB</literal> maps that AWE memory. A good value for
@@ -721,10 +721,10 @@
value. The sum of the sizes of the files must be at least 10MB. On
some operating systems, files must be less than 2GB. If you do not
specify <literal>innodb_data_file_path</literal>, the default
- behavior starting is to create a single 10MB auto-extending data
- file named <filename>ibdata1</filename>. You can set the file size
- to more than 4GB on those operating systems supporting big files.
- You can also use raw disk partitions as data files. See
+ behavior starting is to create a single 10MB auto-extending data
+ file named <filename>ibdata1</filename>. You can set the file size
+ to more than 4GB on those operating systems supporting big files.
+ You can also use raw disk partitions as data files. See
<xref linkend="innodb-raw-devices"/>.
</para></listitem>
@@ -765,10 +765,10 @@
and an insert buffer merge before a shutdown. These operations can
take minutes, or even hours in extreme cases. If you set this
parameter to 1, <literal>InnoDB</literal> skips these operations at
- shutdown. The default value is 1. If you set it to 2 (available
- starting from MySQL 5.0.5, except on Netware), InnoDB will just
- flush its logs and then shut down cold, as if MySQL had crashed; no
- committed transaction will be lost, but a crash recovery will be
+ shutdown. The default value is 1. If you set it to 2 (available
+ starting from MySQL 5.0.5, except on Netware), InnoDB will just
+ flush its logs and then shut down cold, as if MySQL had crashed; no
+ committed transaction will be lost, but a crash recovery will be
done at next startup.
</para></listitem>
@@ -787,7 +787,7 @@
<listitem><para>
<literal>innodb_file_per_table</literal>
</para>
-
+
<!--
TODO: Determine if this bug exists in 5.0.x and handle the
following accordingly
@@ -808,6 +808,7 @@
<command>mysqld</command> to work.
</para>
-->
+
<para>
This option causes <literal>InnoDB</literal> to create each new
table using its own <filename>.ibd</filename> file for storing data
@@ -856,18 +857,18 @@
<para>
This option is relevant only on Unix systems. If set to
- <literal>fdatasync</literal> (the default), <literal>InnoDB</literal> uses
- <literal>fsync()</literal> to flush both the data and log files. If
- set to <literal>O_DSYNC</literal>, <literal>InnoDB</literal> uses
- <literal>O_SYNC</literal> to open and flush the log files, but uses
- <literal>fsync()</literal> to flush the data files. If
- <literal>O_DIRECT</literal> is specified (available on some
- GNU/Linux versions), <literal>InnoDB</literal> uses
- <literal>O_DIRECT</literal> to open the data files, and uses
- <literal>fsync()</literal> to flush both the data and log files.
- Note that <literal>InnoDB</literal> uses <literal>fsync()</literal>
+ <literal>fdatasync</literal> (the default),
+ <literal>InnoDB</literal> uses <literal>fsync()</literal> to flush
+ both the data and log files. If set to <literal>O_DSYNC</literal>,
+ <literal>InnoDB</literal> uses <literal>O_SYNC</literal> to open and
+ flush the log files, but uses <literal>fsync()</literal> to flush
+ the data files. If <literal>O_DIRECT</literal> is specified
+ (available on some GNU/Linux versions), <literal>InnoDB</literal>
+ uses <literal>O_DIRECT</literal> to open the data files, and uses
+ <literal>fsync()</literal> to flush both the data and log files.
+ Note that <literal>InnoDB</literal> uses <literal>fsync()</literal>
instead of <literal>fdatasync()</literal>, and it does not use
- <literal>O_DSYNC</literal> by default because there have been
+ <literal>O_DSYNC</literal> by default because there have been
problems with this on many varieties of Unix.
</para></listitem>
@@ -892,7 +893,7 @@
The timeout in seconds an <literal>InnoDB</literal> transaction may
wait for a lock before being rolled back. <literal>InnoDB</literal>
automatically detects transaction deadlocks in its own lock table
- and rolls back the transaction. InnoDB notices locks set using the
+ and rolls back the transaction. InnoDB notices locks set using the
<literal>LOCK TABLES</literal> statement. The default is 50 seconds.
</para></listitem>
@@ -1190,15 +1191,15 @@
</para>
<para>
- <literal>InnoDB</literal> honors <literal>LOCK TABLES</literal>, and
- MySQL does not return from <literal>LOCK TABLE .. WRITE</literal>
- until all other threads have released all their locks to the table.
+ <literal>InnoDB</literal> honors <literal>LOCK TABLES</literal>, and
+ MySQL does not return from <literal>LOCK TABLE .. WRITE</literal>
+ until all other threads have released all their locks to the table.
The default value is 1, which means that <literal>LOCK
- TABLES</literal> causes InnoDB to lock a table internally. In
+ TABLES</literal> causes InnoDB to lock a table internally. In
applications using <literal>AUTOCOMMIT=1</literal>, InnoDB's
internal table locks can cause deadlocks. You can set
<literal>innodb_table_locks=0</literal> in
- <filename>my.cnf</filename> (or <filename>my.ini</filename> on
+ <filename>my.cnf</filename> (or <filename>my.ini</filename> on
Windows) to remove that problem.
</para></listitem>
@@ -1209,16 +1210,16 @@
<para>
<literal>InnoDB</literal> tries to keep the number of operating
system threads concurrently inside <literal>InnoDB</literal> less
- than or equal to the limit given by this parameter. Before MySQL
- 5.0.8, the default value is 8. If you have low performance and
- <literal>SHOW INNODB STATUS</literal> reveals many threads waiting
- for semaphores, you may have thread thrashing and should try setting
- this parameter lower or higher. If you have a computer with many
- processors and disks, you can try setting the value higher to make
- better use of your computer's resources. A recommended value is the
- sum of the number of processors and disks your system has. A value
- of 500 or greater disables the concurrency checking. Starting with
- MySQL 5.0.8, the default value is 20, and the concurrency checking
+ than or equal to the limit given by this parameter. Before MySQL
+ 5.0.8, the default value is 8. If you have low performance and
+ <literal>SHOW INNODB STATUS</literal> reveals many threads waiting
+ for semaphores, you may have thread thrashing and should try setting
+ this parameter lower or higher. If you have a computer with many
+ processors and disks, you can try setting the value higher to make
+ better use of your computer's resources. A recommended value is the
+ sum of the number of processors and disks your system has. A value
+ of 500 or greater disables the concurrency checking. Starting with
+ MySQL 5.0.8, the default value is 20, and the concurrency checking
will be disabled if the setting is greater than or equal to 20.
</para>
@@ -1233,7 +1234,7 @@
<para>
This option causes <literal>InnoDB</literal> to create a file
<filename><replaceable><datadir></replaceable>/innodb_status.<replaceable><pid></replaceable></filename>
- for periodical <literal>SHOW INNODB STATUS</literal> output.
+ for periodical <literal>SHOW INNODB STATUS</literal> output.
</para></listitem>
</itemizedlist>
@@ -1460,8 +1461,8 @@
<literal>ROLLBACK</literal> to commit or roll back your transaction.
If you want to leave autocommit on, you can enclose your
transactions between <literal>START TRANSACTION</literal> and
- <literal>COMMIT</literal> or <literal>ROLLBACK</literal>. The
- following example shows two transactions. The first is committed;
+ <literal>COMMIT</literal> or <literal>ROLLBACK</literal>. The
+ following example shows two transactions. The first is committed;
the second is rolled back.
</para>
@@ -1520,9 +1521,9 @@
<para>
If you want all your (non-system) tables to be created as
- <literal>InnoDB</literal> tables, you can simply add the line
- <literal>default-table-type=innodb</literal>
- to the <literal>[mysqld]</literal> section of your
+ <literal>InnoDB</literal> tables, you can simply add the line
+ <literal>default-table-type=innodb</literal> to the
+ <literal>[mysqld]</literal> section of your
<filename>my.cnf</filename> or <filename>my.ini</filename> file.
</para>
@@ -1541,11 +1542,11 @@
<para>
If you have <literal>UNIQUE</literal> constraints on secondary keys,
- you can speed up a table import by turning off the uniqueness checks
- temporarily during the import session: <literal>SET UNIQUE_CHECKS=0;</literal>.
- For big tables, this saves a lot of disk I/O because
- <literal>InnoDB</literal> can then use its insert buffer to write
- secondary index records as a batch.
+ you can speed up a table import by turning off the uniqueness checks
+ temporarily during the import session: <literal>SET
+ UNIQUE_CHECKS=0;</literal>. For big tables, this saves a lot of disk
+ I/O because <literal>InnoDB</literal> can then use its insert buffer
+ to write secondary index records as a batch.
</para>
<para>
@@ -1694,8 +1695,8 @@
<!-- description_for_help_topic CONSTRAINT FOREIGN KEY REFERENCES NO ACTION ON DELETE CASCADE SET NULL RESTRICT UPDATE -->
<para>
- <literal>InnoDB</literal> also supports foreign key constraints. The
- syntax for a foreign key constraint definition in
+ <literal>InnoDB</literal> also supports foreign key constraints. The
+ syntax for a foreign key constraint definition in
<literal>InnoDB</literal> looks like this:
</para>
@@ -1742,8 +1743,9 @@
</para></listitem>
<listitem><para>
- If the <literal>CONSTRAINT<replaceable>symbol</replaceable></literal>
- is given, it must be unique in the database. If it is not given,
+ If the
+ <literal>CONSTRAINT<replaceable>symbol</replaceable></literal> is
+ given, it must be unique in the database. If it is not given,
<literal>InnoDB</literal> creates the name automatically.
</para></listitem>
@@ -1767,15 +1769,17 @@
</para>
<itemizedlist>
+
<!-- TODO: Rewrite following paragraph to make clearer. -->
+
<listitem><para>
<literal>CASCADE</literal>: Delete or update the row from the
parent table and automatically delete or update the matching rows
- in the child table. Both <literal>ON DELETE CASCADE</literal> and
+ in the child table. Both <literal>ON DELETE CASCADE</literal> and
<literal>ON UPDATE CASCADE</literal> are available in MySQL 5.0.
- Between two tables, you should not define several
- <literal>ON UPDATE CASCADE</literal> clauses that act on the same
- column in the parent table or in the child table.
+ Between two tables, you should not define several <literal>ON
+ UPDATE CASCADE</literal> clauses that act on the same column in the
+ parent table or in the child table.
</para></listitem>
<listitem><para>
@@ -1783,7 +1787,7 @@
parent table and set the foreign key column(s) in the child table
to <literal>NULL</literal>. This is only valid if the foreign key
columns do not have the <literal>NOT NULL</literal> qualifier
- specified. MySQL 5.0 supports both <literal>ON DELETE SET
+ specified. MySQL 5.0 supports both <literal>ON DELETE SET
NULL</literal> and <literal>ON UPDATE SET NULL</literal> clauses.
</para></listitem>
@@ -1793,8 +1797,8 @@
action</emphasis> in the sense that an attempt to delete or update
a primary key value will not be allowed to proceed if there is a
related foreign key value in the referenced table (Gruber,
- <citetitle>Mastering SQL</citetitle>, 2000:181). In MySQL 5.0,
- <literal>InnoDB</literal> rejects the delete or update operation
+ <citetitle>Mastering SQL</citetitle>, 2000:181). In MySQL 5.0,
+ <literal>InnoDB</literal> rejects the delete or update operation
for the parent table.
</para></listitem>
@@ -1836,9 +1840,9 @@
<para>
<literal>InnoDB</literal> needs indexes on foreign keys and
referenced keys so that foreign key checks can be fast and not
- require a table scan. In MySQL 5.0, the index on the foreign key is
- created automatically. In contrast to older versions (before 4.1.8),
- where the indexes must be created explicitly or the creation of
+ require a table scan. In MySQL 5.0, the index on the foreign key is
+ created automatically. In contrast to older versions (before 4.1.8),
+ where the indexes must be created explicitly or the creation of
foreign key constraints fails.
</para>
@@ -1860,14 +1864,14 @@
foreign key constraint was not correctly formed. Similarly, if an
<literal>ALTER TABLE</literal> fails and it refers to errno 150,
that means a foreign key definition would be incorrectly formed for
- the altered table. In MySQL 5.0, you can use <literal>SHOW INNODB
- STATUS</literal> to display a detailed explanation of the latest
+ the altered table. In MySQL 5.0, you can use <literal>SHOW INNODB
+ STATUS</literal> to display a detailed explanation of the latest
<literal>InnoDB</literal> foreign key error in the server.
</para>
<para>
- <emphasis role="bold">Note</emphasis>: <literal>InnoDB</literal>
- does not check foreign key constraints on those foreign key or
+ <emphasis role="bold">Note</emphasis>: <literal>InnoDB</literal>
+ does not check foreign key constraints on those foreign key or
referenced key values that contain a <literal>NULL</literal> column.
</para>
@@ -1899,7 +1903,7 @@
infinite loops resulting from cascaded updates. A self-referential
<literal>ON DELETE SET NULL</literal>, on the other hand, is
possible, as is a self-referential <literal>ON DELETE
- CASCADE</literal>. In MySQL 5.0, cascading operations may not be
+ CASCADE</literal>. In MySQL 5.0, cascading operations may not be
nested more than 15 levels deep.
</para>
@@ -1912,10 +1916,10 @@
are only checked after the WHOLE SQL statement has been processed.
</para>
- <para>
- <emphasis role="bold">Note</emphasis>: Currently, triggers are not
- activated by cascaded foreign key actions.
- </para>
+ <para>
+ <emphasis role="bold">Note</emphasis>: Currently, triggers are not
+ activated by cascaded foreign key actions.
+ </para>
<para>
A simple example that relates <literal>parent</literal> and
@@ -1964,7 +1968,7 @@
</programlisting>
<para>
- <literal>InnoDB</literal> allows you to add a new foreign key
+ <literal>InnoDB</literal> allows you to add a new foreign key
constraint to a table by using <literal>ALTER TABLE</literal>:
</para>
@@ -1997,7 +2001,7 @@
</indexterm>
<para>
- <literal>InnoDB</literal> also supports the use of <literal>ALTER
+ <literal>InnoDB</literal> also supports the use of <literal>ALTER
TABLE</literal> to drop foreign keys:
</para>
@@ -2040,13 +2044,15 @@
</programlisting>
<para>
- he <literal>InnoDB</literal> parser allows you to use backticks
- around table and column names in a <literal>FOREIGN KEY ...
- REFERENCES ...</literal> clause. The <literal>InnoDB</literal>
+ he <literal>InnoDB</literal> parser allows you to use backticks
+ around table and column names in a <literal>FOREIGN KEY ...
+ REFERENCES ...</literal> clause. The <literal>InnoDB</literal>
parser also takes into account the setting of the
<literal>lower_case_table_names</literal> system variable.
</para>
+
<!-- Does this still apply in 5.0? -->
+
<!--
<para>
Before MySQL 3.23.50, <literal>ALTER TABLE</literal> or
@@ -2064,9 +2070,10 @@
TABLE</literal>, so the same considerations apply.
</para>
-->
+
<para>
- <literal>InnoDB</literal> returns a table's foreign key definitions
- as part of the output of the <literal>SHOW CREATE TABLE</literal>
+ <literal>InnoDB</literal> returns a table's foreign key definitions
+ as part of the output of the <literal>SHOW CREATE TABLE</literal>
statement:
</para>
@@ -2104,8 +2111,8 @@
To make it easier to reload dump files for tables that have foreign
key relationships, <command>mysqldump</command> automatically
includes a statement in the dump output to set
- <literal>FOREIGN_KEY_CHECKS</literal> to 0. This avoids problems
- with tables having to be reloaded in a particular order when the
+ <literal>FOREIGN_KEY_CHECKS</literal> to 0. This avoids problems
+ with tables having to be reloaded in a particular order when the
dump is reloaded. It is also possible to set this variable manually:
</para>
@@ -2118,9 +2125,9 @@
<para>
This allows you to import the tables in any order if the dump file
contains tables that are not correctly ordered for foreign keys. It
- also speeds up the import operation. Setting
- <literal>FOREIGN_KEY_CHECKS</literal> to 0 can also be useful for
- ignoring foreign key constraints during <literal>LOAD DATA</literal>
+ also speeds up the import operation. Setting
+ <literal>FOREIGN_KEY_CHECKS</literal> to 0 can also be useful for
+ ignoring foreign key constraints during <literal>LOAD DATA</literal>
and <literal>ALTER TABLE</literal> operations.
</para>
@@ -2176,26 +2183,29 @@
</para>
<para>
- One minor limitation in <literal>InnoDB</literal> replication is
+ One minor limitation in <literal>InnoDB</literal> replication is
that <literal>LOAD TABLE FROM MASTER</literal> does not work for
- <literal>InnoDB</literal> type tables. There are two possible
- workarounds:
-
+ <literal>InnoDB</literal> type tables. There are two possible
+ workarounds:
+
<itemizedlist>
- <listitem>
- <para>Dump the table on the master and import the dump file into the
- slave.</para>
- </listitem>
- <listitem>
- <para>Use <literal>ALTER TABLE
- <replaceable>tbl_name</replaceable> TYPE=MyISAM</literal> on the
- master before setting up replication with <literal>LOAD TABLE
- <replaceable>tbl_name</replaceable> FROM MASTER</literal>, and
- then use <literal>ALTER TABLE</literal> to convert the master
- table back to <literal>InnoDB</literal> afterward.</para>
- </listitem>
- </itemizedlist>
- </para>
+
+ <listitem><para>
+ Dump the table on the master and import the dump file into the
+ slave.
+ </para></listitem>
+
+ <listitem><para>
+ Use <literal>ALTER TABLE <replaceable>tbl_name</replaceable>
+ TYPE=MyISAM</literal> on the master before setting up replication
+ with <literal>LOAD TABLE <replaceable>tbl_name</replaceable> FROM
+ MASTER</literal>, and then use <literal>ALTER TABLE</literal> to
+ convert the master table back to <literal>InnoDB</literal>
+ afterward.
+ </para></listitem>
+
+ </itemizedlist>
+ </para>
<para>
Transactions that fail on the master do not affect replication at
@@ -2217,8 +2227,8 @@
<title id='title-multiple-tablespaces'>&title-multiple-tablespaces;</title>
<para>
- In MySQL 5.0, you can store each <literal>InnoDB</literal> table and
- its indexes in its own file. This feature is called ``multiple
+ In MySQL 5.0, you can store each <literal>InnoDB</literal> table and
+ its indexes in its own file. This feature is called ``multiple
tablespaces'' because in effect each table has its own tablespace.
</para>
@@ -2228,7 +2238,7 @@
restore backups of single tables quickly without interrupting the
use of the remaining InnoDB tables.
</para>
-
+
<para>
You can enable multiple tablespaces by adding this line to the
<literal>[mysqld]</literal> section of <filename>my.cnf</filename>:
@@ -2438,14 +2448,14 @@
</para>
<para>
- The easiest way to increase the size of the <literal>InnoDB</literal>
- tablespace is to configure it from the beginning to be
- auto-extending. Specify the <literal>autoextend</literal> attribute
- for the last data file in the tablespace definition. Then
- <literal>InnoDB</literal> increases the size of that file
- automatically in 8MB increments when it runs out of space. The
+ The easiest way to increase the size of the <literal>InnoDB</literal>
+ tablespace is to configure it from the beginning to be
+ auto-extending. Specify the <literal>autoextend</literal> attribute
+ for the last data file in the tablespace definition. Then
+ <literal>InnoDB</literal> increases the size of that file
+ automatically in 8MB increments when it runs out of space. The
increment size can be configured setting the value of
- <literal>innodb_autoextend_increment</literal>, which is measured in
+ <literal>innodb_autoextend_increment</literal>, which is measured in
megabytes,and whose default value is 8.
</para>
@@ -2695,16 +2705,16 @@
<para>
If there is database page corruption, you may want to dump your
- tables from the database with <literal>SELECT INTO
- OUTFILE</literal>; usually, most of the data obtained in this way is
+ tables from the database with <literal>SELECT INTO
+ OUTFILE</literal>; usually, most of the data obtained in this way is
intact. Even so, the corruption may cause <literal>SELECT * FROM
<replaceable>tbl_name</replaceable></literal> or
<literal>InnoDB</literal> background operations to crash or assert,
- or even make <literal>InnoDB</literal> roll-forward recovery crash.
- However, you can use to force the <literal>InnoDB</literal> storage
- engine to start up while preventing background operations from
- running, so that you are able to dump your tables. For example, you
- can add the following line to the <literal>[mysqld]</literal>
+ or even make <literal>InnoDB</literal> roll-forward recovery crash.
+ However, you can use to force the <literal>InnoDB</literal> storage
+ engine to start up while preventing background operations from
+ running, so that you are able to dump your tables. For example, you
+ can add the following line to the <literal>[mysqld]</literal>
section of your option file before restarting the server:
</para>
@@ -2790,21 +2800,21 @@
The database must not otherwise be used with any of these options
enabled! As a safety measure, <literal>InnoDB</literal> prevents
users from performing <literal>INSERT</literal>,
- <literal>UPDATE</literal>, or <literal>DELETE</literal> operations
- when <literal>innodb_force_recovery</literal> is set to a value
+ <literal>UPDATE</literal>, or <literal>DELETE</literal> operations
+ when <literal>innodb_force_recovery</literal> is set to a value
greater than 0.
</para>
<para>
- You may <literal>DROP</literal> or <literal>CREATE</literal> tables
- even if forced recovery is used. If you know that a given table is
- causing a crash on rollback, you can drop it. You can also use this
- to stop a runaway rollback caused by a failing mass import or
- <literal>ALTER TABLE</literal>. You can kill the
- <command>mysqld</command> process and set
- <literal>innodb_force_recovery</literal> to <literal>3</literal> to
- bring the database up without the rollback, then
- <literal>DROP</literal> the table that is causing the runaway
+ You may <literal>DROP</literal> or <literal>CREATE</literal> tables
+ even if forced recovery is used. If you know that a given table is
+ causing a crash on rollback, you can drop it. You can also use this
+ to stop a runaway rollback caused by a failing mass import or
+ <literal>ALTER TABLE</literal>. You can kill the
+ <command>mysqld</command> process and set
+ <literal>innodb_force_recovery</literal> to <literal>3</literal> to
+ bring the database up without the rollback, then
+ <literal>DROP</literal> the table that is causing the runaway
rollback.
</para>
@@ -2862,13 +2872,13 @@
<title id='title-moving'>&title-moving;</title>
<para>
- On Windows, <literal>InnoDB</literal> always stores database and
+ On Windows, <literal>InnoDB</literal> always stores database and
table names internally in lowercase. To move databases in a binary
format from Unix to Windows or from Windows to Unix, you should have
all table and database names in lowercase. A convenient way to
accomplish this is to add the following line to the
<literal>[mysqld]</literal> section of your
- <filename>my.cnf</filename> or <filename>my.ini</filename> before
+ <filename>my.cnf</filename> or <filename>my.ini</filename> before
creating any databases or tables:
</para>
@@ -2893,10 +2903,10 @@
</para>
<para>
- One way to increase performance is to switch off autocommit mode when
- importing data, assuming that the tablespace has enough space for the
- big rollback segment that the big import transactions generate. Do
- the commit only after importing a whole table or a segment of a
+ One way to increase performance is to switch off autocommit mode when
+ importing data, assuming that the tablespace has enough space for the
+ big rollback segment that the big import transactions generate. Do
+ the commit only after importing a whole table or a segment of a
table.
</para>
@@ -3218,12 +3228,12 @@
<para>
In terms of the SQL:1992 transaction isolation levels, the
<literal>InnoDB</literal> default is <literal>REPEATABLE
- READ</literal>. In MySQL 5.0, <literal>InnoDB</literal> offers all
- four transaction isolation levels described by the SQL standard. You
- can set the default isolation level for all connections by using the
- <literal>--transaction-isolation</literal> option on the command
- line or in option files. For example, you can set the option in the
- <literal>[mysqld]</literal> section of <filename>my.cnf</filename>
+ READ</literal>. In MySQL 5.0, <literal>InnoDB</literal> offers all
+ four transaction isolation levels described by the SQL standard. You
+ can set the default isolation level for all connections by using the
+ <literal>--transaction-isolation</literal> option on the command
+ line or in option files. For example, you can set the option in the
+ <literal>[mysqld]</literal> section of <filename>my.cnf</filename>
like this:
</para>
@@ -3763,17 +3773,16 @@
<listitem><para>
<literal>LOCK TABLES</literal> sets table locks, but it is the
higher MySQL layer above the <literal>InnoDB</literal> layer that
- sets these locks. <literal>InnoDB</literal> is aware of table locks
- if <literal>innodb_table_locks=1</literal> and
+ sets these locks. <literal>InnoDB</literal> is aware of table locks
+ if <literal>innodb_table_locks=1</literal> and
<literal>AUTOCOMMIT=0</literal>, and the MySQL layer above
<literal>InnoDB</literal> knows about row-level locks. Otherwise,
- InooDB's automatic deadlock detection cannot detect deadlocks where
- such table locks are involved. Also, since the higher MySQL layer
- does not know about row-level locks, it is possible to get a table
- lock on a table where another user currently has row-level locks.
- However, this does not endager transaction
- integrity, as discussed in
- <xref linkend="innodb-deadlock-detection"/>. See also
+ InooDB's automatic deadlock detection cannot detect deadlocks where
+ such table locks are involved. Also, since the higher MySQL layer
+ does not know about row-level locks, it is possible to get a table
+ lock on a table where another user currently has row-level locks.
+ However, this does not endager transaction integrity, as discussed
+ in <xref linkend="innodb-deadlock-detection"/>. See also
<xref linkend="innodb-restrictions"/>.
</para></listitem>
@@ -3824,17 +3833,16 @@
<literal>TRUNCATE</literal>, <literal>UNLOCK TABLES</literal>.
</para></listitem>
- <listitem>
- <para>Before MySQL 5.0.8, <literal>CREATE TABLE</literal> commits
- if binary logging is used. Starting with MySQL 5.0.8, the
- statements <literal>CREATE TABLE</literal>, <literal>TRUNCATE
- TABLE</literal>, <literal>DROP DATABASE</literal>, and
- <literal>CREATE DATABASE</literal> cause an implicit
- commit.</para>
- </listitem>
+ <listitem><para>
+ Before MySQL 5.0.8, <literal>CREATE TABLE</literal> commits if
+ binary logging is used. Starting with MySQL 5.0.8, the statements
+ <literal>CREATE TABLE</literal>, <literal>TRUNCATE TABLE</literal>,
+ <literal>DROP DATABASE</literal>, and <literal>CREATE
+ DATABASE</literal> cause an implicit commit.
+ </para></listitem>
<listitem><para>
- The <literal>CREATE TABLE</literal> statement in
+ The <literal>CREATE TABLE</literal> statement in
<literal>InnoDB</literal> is processed as a single transaction.
This means that a <literal>ROLLBACK</literal> from the user does
not undo <literal>CREATE TABLE</literal> statements the user made
@@ -3852,20 +3860,20 @@
<para>
<literal>InnoDB</literal> automatically detects a deadlock of
transactions and rolls back a transaction or transactions to prevent
- the deadlock. <literal>InnoDB</literal> tries to pick small
- transactions to roll back, the size of a transaction being
+ the deadlock. <literal>InnoDB</literal> tries to pick small
+ transactions to roll back, the size of a transaction being
determined by the number of rows inserted, updated, or deleted.
</para>
<para>
- <literal>InnoDB</literal> is aware of table locks if
- <literal>innodb_table_locks=1</literal> (1 is the default), and the
- MySQL layer above it knows about row-level locks. Otherwise,
- <literal>InnoDB</literal> cannot detect deadlocks where a table lock
+ <literal>InnoDB</literal> is aware of table locks if
+ <literal>innodb_table_locks=1</literal> (1 is the default), and the
+ MySQL layer above it knows about row-level locks. Otherwise,
+ <literal>InnoDB</literal> cannot detect deadlocks where a table lock
set by a MySQL <literal>LOCK TABLES</literal> statement or a lock
set by a storage engine other than <literal>InnoDB</literal> is
- involved. You must resolve these situations by setting the value
- of the <literal>innodb_lock_wait_timeout</literal> system variable.
+ involved. You must resolve these situations by setting the value of
+ the <literal>innodb_lock_wait_timeout</literal> system variable.
</para>
<para>
@@ -3988,7 +3996,7 @@
<listitem><para>
In applications using <literal>AUTOCOMMIT=1</literal> and MySQL's
- <literal>LOCK TABLES</literal> command, MySQL 5.0 does not set
+ <literal>LOCK TABLES</literal> command, MySQL 5.0 does not set
InnoDB table locks if <literal>AUTOCOMMIT=1</literal>.
</para></listitem>
@@ -4054,22 +4062,22 @@
takes <replaceable>N</replaceable> bytes to store data, even if the
string is shorter or its value is <literal>NULL</literal>. Smaller
tables fit better in the buffer pool and reduce disk I/O.
- </para>
-
- <para>
+ </para>
+
+ <para>
When using <literal>row_format=compact</literal> (the default InnoDB
- record format in MySQL 5.0) and variable-length character sets, such as
- <literal>utf8</literal> or <literal>sjis</literal>,
- <literal>CHAR(<replaceable>N</replaceable>)</literal> will occupy
- a variable amount of space, at least <replaceable>N</replaceable>
+ record format in MySQL 5.0) and variable-length character sets, such
+ as <literal>utf8</literal> or <literal>sjis</literal>,
+ <literal>CHAR(<replaceable>N</replaceable>)</literal> will occupy a
+ variable amount of space, at least <replaceable>N</replaceable>
bytes.
</para></listitem>
<listitem><para>
- In some versions of GNU/Linux and Unix, flushing files to disk with
- the Unix <literal>fsync()</literal> and other similar methods is
- surprisingly slow. The default method that <literal>InnoDB</literal>
- uses is the <literal>fsync()</literal> function. If you are not
+ In some versions of GNU/Linux and Unix, flushing files to disk with
+ the Unix <literal>fsync()</literal> and other similar methods is
+ surprisingly slow. The default method that <literal>InnoDB</literal>
+ uses is the <literal>fsync()</literal> function. If you are not
satisfied with the database write performance, you might try setting
<literal>innodb_flush_method</literal> in
<filename>my.cnf</filename> to <literal>O_DSYNC</literal>, although
@@ -4077,14 +4085,14 @@
</para></listitem>
<listitem><para>
- When using the InnoDB storage engine on Solaris 10 for x86_64
- architecture (AMD Opteron), it is important to to mount any
- filesystems used for storing InnoDB-related files using the
- <literal>forcedirectio</literal> option. (The default on Solaris
- 10/x86_64 is <emphasis role="bold">not</emphasis> to use this
- filesystem mounting option.) Failing to use
- <literal>forcedirectio</literal> will cause a serious degradation
- of InnoDB's speed and performance on this platform.
+ When using the InnoDB storage engine on Solaris 10 for x86_64
+ architecture (AMD Opteron), it is important to to mount any
+ filesystems used for storing InnoDB-related files using the
+ <literal>forcedirectio</literal> option. (The default on Solaris
+ 10/x86_64 is <emphasis role="bold">not</emphasis> to use this
+ filesystem mounting option.) Failing to use
+ <literal>forcedirectio</literal> will cause a serious degradation of
+ InnoDB's speed and performance on this platform.
</para></listitem>
<listitem><para>
@@ -4144,7 +4152,7 @@
<listitem><para>
If you have <literal>UNIQUE</literal> constraints on secondary keys,
- you can speed up table imports by temporarily turning off the
+ you can speed up table imports by temporarily turning off the
uniqueness checks during the import session:
</para>
@@ -4160,7 +4168,7 @@
<listitem><para>
If you have <literal>FOREIGN KEY</literal> constraints in your
- tables, you can speed up table imports by turning the foreign key
+ tables, you can speed up table imports by turning the foreign key
checks off for the duration of the import session:
</para>
@@ -4181,9 +4189,7 @@
[mysqld]
query_cache_type = ON
query_cache_size = 10M
-</programlisting>
-
- </listitem>
+</programlisting></listitem>
</itemizedlist>
@@ -4192,15 +4198,15 @@
<title id='title-innodb-monitor'>&title-innodb-monitor;</title>
<para>
- <literal>InnoDB</literal> includes <literal>InnoDB</literal>
- Monitors that print information about the <literal>InnoDB</literal>
- internal state. You can use the SQL statement <literal>SHOW INNODB
+ <literal>InnoDB</literal> includes <literal>InnoDB</literal>
+ Monitors that print information about the <literal>InnoDB</literal>
+ internal state. You can use the SQL statement <literal>SHOW INNODB
STATUS</literal> to fetch the output of the standard
<literal>InnoDB</literal> Monitor to your SQL client. This
information is useful in performance tuning. (If you are using the
<command>mysql</command> interactive SQL client, the output is more
- readable if you replace the usual semicolon statement terminator
- with <literal>\G</literal>.) For a discussion of
+ readable if you replace the usual semicolon statement terminator
+ with <literal>\G</literal>.) For a discussion of
<literal>InnoDB</literal> lock modes see
<xref linkend="innodb-lock-modes"/>.
</para>
@@ -4275,7 +4281,7 @@
<para>
The <literal>CREATE TABLE</literal> syntax is just a way to pass a
- command to the <literal>InnoDB</literal> engine through MySQL's SQL
+ command to the <literal>InnoDB</literal> engine through MySQL's SQL
parser: The only things that matter are the table name
<literal>innodb_monitor</literal> and that it be an
<literal>InnoDB</literal> table. The structure of the table is not
@@ -4287,11 +4293,11 @@
</para>
<para>
- You can use <literal>innodb_lock_monitor</literal> in a similar
- fashion. This is the same as <literal>innodb_monitor</literal>,
- except that it also provides a great deal of lock information. A
- separate <literal>innodb_tablespace_monitor</literal> prints a list
- of created file segments existing in the tablespace and validates
+ You can use <literal>innodb_lock_monitor</literal> in a similar
+ fashion. This is the same as <literal>innodb_monitor</literal>,
+ except that it also provides a great deal of lock information. A
+ separate <literal>innodb_tablespace_monitor</literal> prints a list
+ of created file segments existing in the tablespace and validates
the tablespace allocation data structures. In addition, there is
<literal>innodb_table_monitor</literal> with which you can print the
contents of the <literal>InnoDB</literal> internal data dictionary.
@@ -4518,15 +4524,15 @@
</itemizedlist>
<para>
- <literal>InnoDB</literal> sends diagnostic output to
- <literal>stderr</literal> or to files rather than to
- <literal>stdout</literal> or fixed-size memory buffers, in order to
- avoid potential buffer overflows. As a side effect, the output of
- <literal>SHOW INNODB STATUS</literal> is written to a status file
+ <literal>InnoDB</literal> sends diagnostic output to
+ <literal>stderr</literal> or to files rather than to
+ <literal>stdout</literal> or fixed-size memory buffers, in order to
+ avoid potential buffer overflows. As a side effect, the output of
+ <literal>SHOW INNODB STATUS</literal> is written to a status file
every fifteen seconds. The name of the file is
<filename>innodb_status.<replaceable>pid</replaceable></filename>,
where <replaceable>pid</replaceable> is the server process ID. This
- file is created in the MySQL data directory.
+ file is created in the MySQL data directory.
<literal>InnoDB</literal> removes the file for a normal shutdown. If
abnormal shutdowns have occurred, instances of these status files
may be present and must be removed manually. Before removing them,
@@ -4617,7 +4623,7 @@
with all the dead rows. In such a case, it would be good to throttle
new row operations, and allocate more resources for the purge thread.
The startup option and settable global variable
- <literal>innodb_max_purge_lag</literal> exists for exactly this
+ <literal>innodb_max_purge_lag</literal> exists for exactly this
purpose. See <xref linkend="innodb-start"/> for more information.
</para>
@@ -4900,10 +4906,10 @@
</itemizedlist>
<para>
- <literal>InnoDB</literal> uses a novel file flush technique called
- doublewrite. It adds safety to recovery following an operating
- system crash or a power outage, and improves performance on most
- varieties of Unix by reducing the need for
+ <literal>InnoDB</literal> uses a novel file flush technique called
+ doublewrite. It adds safety to recovery following an operating
+ system crash or a power outage, and improves performance on most
+ varieties of Unix by reducing the need for
<literal>fsync()</literal> operations.
</para>
@@ -4925,9 +4931,9 @@
<title id='title-innodb-raw-devices'>&title-innodb-raw-devices;</title>
<para>
- In MySQL 5.0, you can also use raw disk partitions as tablespace
- data files. By using a raw disk, you can perform non-buffered I/O on
- Windows and on some Unix systems without filesystem overhead, which
+ In MySQL 5.0, you can also use raw disk partitions as tablespace
+ data files. By using a raw disk, you can perform non-buffered I/O on
+ Windows and on some Unix systems without filesystem overhead, which
may improve performance.
</para>
@@ -4976,7 +4982,7 @@
</para>
<para>
- On Windows, you can allocate a disk partition as a data file like
+ On Windows, you can allocate a disk partition as a data file like
this:
</para>
@@ -5170,7 +5176,7 @@
</itemizedlist>
<para>
- During implicit rollbacks, as well as during the execution of an
+ During implicit rollbacks, as well as during the execution of an
explicit <literal>ROLLBACK</literal> SQL command, <literal>SHOW
PROCESSLIST</literal> displays "Rolling back" in the
<literal>State</literal> column for the relevant connection.
@@ -5840,11 +5846,11 @@
</para>
<para>
- The parameter is incorrect. (If you get this error on Windows, and
+ The parameter is incorrect. (If you get this error on Windows, and
you have set <literal>innodb_file_per_table</literal> in
<filename>my.cnf</filename> or <filename>my.ini</filename>, then
- add the line <literal>innodb_flush_method=unbuffered</literal> to
- your <filename>my.cnf</filename> or <filename>my.ini</filename>
+ add the line <literal>innodb_flush_method=unbuffered</literal> to
+ your <filename>my.cnf</filename> or <filename>my.ini</filename>
file.)
</para></listitem>
@@ -5896,16 +5902,16 @@
<listitem><para>
The maximum row length, except for <literal>VARCHAR</literal>,
- <literal>BLOB</literal> and
- <literal>TEXT</literal> columns, is slightly less than half of a
- database page. That is, the maximum row length is about 8000 bytes.
- <literal>LONGBLOB</literal> and <literal>LONGTEXT</literal> columns
- must be less than 4GB, and the total row length, including also
- <literal>BLOB</literal> and <literal>TEXT</literal> columns, must be
- less than 4GB. <literal>InnoDB</literal> stores the first 768 bytes
- of a <literal>VARCHAR</literal>,
- <literal>BLOB</literal>, or <literal>TEXT</literal> column in
- the row, and the rest into separate pages.
+ <literal>BLOB</literal> and <literal>TEXT</literal> columns, is
+ slightly less than half of a database page. That is, the maximum row
+ length is about 8000 bytes. <literal>LONGBLOB</literal> and
+ <literal>LONGTEXT</literal> columns must be less than 4GB, and the
+ total row length, including also <literal>BLOB</literal> and
+ <literal>TEXT</literal> columns, must be less than 4GB.
+ <literal>InnoDB</literal> stores the first 768 bytes of a
+ <literal>VARCHAR</literal>, <literal>BLOB</literal>, or
+ <literal>TEXT</literal> column in the row, and the rest into
+ separate pages.
</para></listitem>
<listitem><para>
@@ -6049,17 +6055,17 @@
physical size reserved by the table. The row count is only a rough
estimate used in SQL optimization.
</para></listitem>
-
+
<listitem><para>
- In MySQL 5.0, the MySQL <literal>LOCK TABLES</literal> operation
+ In MySQL 5.0, the MySQL <literal>LOCK TABLES</literal> operation
acquires two locks on each table if
- <literal>innodb_table_locks=1</literal>, with 1 being the default.)
+ <literal>innodb_table_locks=1</literal>, with 1 being the default.)
In addition to a table lock on the MySQL layer, it also acquires an
- <literal>InnoDB</literal> table lock. Older versions of MySQL did
- not acquire <literal>InnoDB</literal> table locks; the old behavior
- can be selected by setting <literal>innodb_table_locks=0</literal>.
- If no <literal>InnoDB</literal> table lock is acquired,
- <literal>LOCK TABLES</literal> completes even if some records of the
+ <literal>InnoDB</literal> table lock. Older versions of MySQL did
+ not acquire <literal>InnoDB</literal> table locks; the old behavior
+ can be selected by setting <literal>innodb_table_locks=0</literal>.
+ If no <literal>InnoDB</literal> table lock is acquired,
+ <literal>LOCK TABLES</literal> completes even if some records of the
tables are being locked by other transactions.
</para></listitem>
@@ -6099,7 +6105,8 @@
</para></listitem>
<listitem><para>
- Currently, triggers are not activated by cascaded foreign key actions.
+ Currently, triggers are not activated by cascaded foreign key
+ actions.
</para></listitem>
</itemizedlist>
@@ -6121,12 +6128,12 @@
</para></listitem>
<listitem><para>
- When troubleshooting, it is usually best to run the MySQL server
- from the command prompt, rather than through the
+ When troubleshooting, it is usually best to run the MySQL server
+ from the command prompt, rather than through the
<command>mysqld_safe</command> wrapper or as a Windows service. You
- can then see what <command>mysqld</command> prints to the console,
- and so have a better grasp of what is going on. On Windows, you must
- start the server with the <filename>--console</filename> option to
+ can then see what <command>mysqld</command> prints to the console,
+ and so have a better grasp of what is going on. On Windows, you must
+ start the server with the <filename>--console</filename> option to
direct the output to the console window.
</para></listitem>
@@ -6143,8 +6150,8 @@
</para></listitem>
<listitem><para>
- If you suspect that a table is corrupt, run <literal>CHECK
- TABLE</literal> on that table.
+ If you suspect that a table is corrupt, run <literal>CHECK
+ TABLE</literal> on that table.
</para></listitem>
</itemizedlist>
@@ -6159,8 +6166,8 @@
in the database directories, while <literal>InnoDB</literal> also
stores the information into its own data dictionary inside the
tablespace files. If you move <filename>.frm</filename> files
- around, or if the server crashes in the middle of a data dictionary
- operation, the <filename>.frm</filename> files may end up out of
+ around, or if the server crashes in the middle of a data dictionary
+ operation, the <filename>.frm</filename> files may end up out of
sync with InnoDB's internal data dictionary.
</para>
--- 1.1/refman-5.0/maxdb.xml 2005-06-16 14:46:21 -05:00
+++ 1.2/refman-5.0/maxdb.xml 2005-07-14 15:11:32 -05:00
@@ -66,7 +66,7 @@
products distributed by MySQL AB. Thus, MaxDB is available under the
GNU General Public License, and a commercial license. For more
information on licensing, see
- <ulink url="http://www.mysql.com/company/legal/licensing/">http://www.mysql.com/company/legal/licensing/</ulink>.
+ <ulink url="http://www.mysql.com/company/legal/licensing/"/>.
</para>
<para>
@@ -86,10 +86,9 @@
<para>
The main page for information about MaxDB is
- <ulink url="http://www.mysql.com/products/maxdb">http://www.mysql.com/products/maxdb</ulink>.
- Information formerly available at
- <ulink url="http://www.sapdb.org">http://www.sapdb.org</ulink> has
- been moved there.
+ <ulink url="http://www.mysql.com/products/maxdb"/>. Information
+ formerly available at <ulink url="http://www.sapdb.org"/> has been
+ moved there.
</para>
</section>
--- 1.6/refman-5.0/mysql-apis.xml 2005-07-11 13:19:44 -05:00
+++ 1.7/refman-5.0/mysql-apis.xml 2005-07-14 15:11:32 -05:00
@@ -12193,11 +12193,11 @@
<para>
In the older binaries we distribute on our Web site
- (<ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink>),
- the client libraries are not normally compiled with the thread-safe
- option (the Windows binaries are by default compiled to be
- thread-safe). Newer binary distributions should have both a normal
- and a thread-safe client library.
+ (<ulink url="http://www.mysql.com/"/>), the client libraries are not
+ normally compiled with the thread-safe option (the Windows binaries
+ are by default compiled to be thread-safe). Newer binary
+ distributions should have both a normal and a thread-safe client
+ library.
</para>
<para>
@@ -12881,7 +12881,7 @@
under the GPL or a compatible license. For those who are not able
to do this, another option is to purchase a commercial license for
the MySQL code from MySQL AB. For details, please see
- <ulink url="http://www.mysql.com/company/legal/licensing/">http://www.mysql.com/company/legal/licensing/</ulink>.
+ <ulink url="http://www.mysql.com/company/legal/licensing/"/>.
</para>
</section>
@@ -12922,8 +12922,7 @@
you will likely want to configure the MySQL server to use the
<command>--old-passwords</command> option (see
<xref linkend="old-client"/>). This extension is documented on the
- PHP Website at
- <ulink url="http://php.net/mysql">http://php.net/mysql</ulink>.
+ PHP Website at <ulink url="http://php.net/mysql"/>.
</para></listitem>
<listitem><para>
@@ -12935,10 +12934,9 @@
APIs. In addition, this extension provides an advanced,
object-oriented programming interface. You can read the
documentation for the <emphasis role="bold">mysqli</emphasis>
- extension at
- <ulink url="http://php.net/mysqli">http://php.net/mysqli</ulink>. A
- helpful article can be found at
- <ulink url="http://www.zend.com/php5/articles/php5-mysqli.php">http://www.zend.com/php5/articles/php5-mysqli.php</ulink>.
+ extension at <ulink url="http://php.net/mysqli"/>. A helpful article
+ can be found at
+ <ulink url="http://www.zend.com/php5/articles/php5-mysqli.php"/>.
</para></listitem>
</itemizedlist>
@@ -13063,10 +13061,9 @@
<listitem><para>
For online information about Perl DBI, visit the DBI Web site,
- <ulink url="http://dbi.perl.org/">http://dbi.perl.org/</ulink>. That
- site hosts a general DBI mailing list. MySQL AB hosts a list
- specifically about <literal>DBD::mysql</literal>; see
- <xref linkend="mailing-list"/>.
+ <ulink url="http://dbi.perl.org/"/>. That site hosts a general DBI
+ mailing list. MySQL AB hosts a list specifically about
+ <literal>DBD::mysql</literal>; see <xref linkend="mailing-list"/>.
</para></listitem>
<listitem><para>
@@ -13074,14 +13071,14 @@
<citetitle>Programming the Perl DBI</citetitle> (Alligator Descartes
and Tim Bunce, O'Reilly & Associates, 2000). Information about
the book is available at the DBI Web site,
- <ulink url="http://dbi.perl.org/">http://dbi.perl.org/</ulink>.
+ <ulink url="http://dbi.perl.org/"/>.
</para>
<para>
For information that focuses specifically on using DBI with MySQL,
see <citetitle>MySQL and Perl for the Web</citetitle> (Paul DuBois,
New Riders, 2001). This book's Web site is
- <ulink url="http://www.kitebird.com/mysql-perl/">http://www.kitebird.com/mysql-perl/</ulink>.
+ <ulink url="http://www.kitebird.com/mysql-perl/"/>.
</para></listitem>
</itemizedlist>
@@ -13103,7 +13100,7 @@
<para>
<literal>MySQL++</literal> is a MySQL API for C++. Warren Young has
taken over this project. More information can be found at
- <ulink url="http://www.mysql.com/products/mysql++/">http://www.mysql.com/products/mysql++/</ulink>.
+ <ulink url="http://www.mysql.com/products/mysql++/"/>.
</para>
<section id="borland-c-plus-plus">
@@ -13145,7 +13142,7 @@
<para>
<literal>MySQLdb</literal> provides MySQL support for Python,
compliant with the Python DB API version 2.0. It can be found at
- <ulink url="http://sourceforge.net/projects/mysql-python/">http://sourceforge.net/projects/mysql-python/</ulink>.
+ <ulink url="http://sourceforge.net/projects/mysql-python/"/>.
</para>
</section>
@@ -13161,7 +13158,7 @@
<para>
<literal>MySQLtcl</literal> is a simple API for accessing a MySQL
database server from the Tcl programming language. It can be found at
- <ulink url="http://www.xdobry.de/mysqltcl/">http://www.xdobry.de/mysqltcl/</ulink>.
+ <ulink url="http://www.xdobry.de/mysqltcl/"/>.
</para>
</section>
@@ -13183,7 +13180,7 @@
Eiffel MySQL is an interface to the MySQL database server using the
Eiffel programming language, written by Michael Ravits. It can be
found at
- <ulink url="http://efsa.sourceforge.net/archive/ravits/mysql.htm">http://efsa.sourceforge.net/archive/ravits/mysql.htm</ulink>.
+ <ulink url="http://efsa.sourceforge.net/archive/ravits/mysql.htm"/>.
</para>
</section>
--- 1.28/refman-5.0/mysql-database-administration.xml 2005-07-13 09:39:48 -05:00
+++ 1.29/refman-5.0/mysql-database-administration.xml 2005-07-14 15:11:32 -05:00
@@ -217,8 +217,8 @@
<para>
The MySQL bug reporting script. It can be used to send a bug report
to the MySQL mailing list. (You can also visit
- <ulink url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>
- to file a bug report online. See <xref linkend="bug-reports"/>.)
+ <ulink url="http://bugs.mysql.com/"/> to file a bug report online.
+ See <xref linkend="bug-reports"/>.)
</para></listitem>
</itemizedlist>
@@ -253,8 +253,8 @@
server (<literal>mysqld.exe</literal>) and the MySQL-Max server
(<command>mysqld-max.exe</command>), so you need not get a special
distribution. Just use a regular Windows distribution, available at
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>.
- See <xref linkend="windows-installation"/>.
+ <ulink url="http://dev.mysql.com/downloads/"/>. See
+ <xref linkend="windows-installation"/>.
</para></listitem>
<listitem><para>
@@ -16202,7 +16202,7 @@
<listitem><para>
Install the OpenSSL library. We have tested MySQL with OpenSSL
0.9.6. If you need OpenSSL, visit
- <ulink url="http://www.openssl.org">http://www.openssl.org</ulink>.
+ <ulink url="http://www.openssl.org"/>.
</para></listitem>
<listitem><para>
@@ -16768,11 +16768,11 @@
<para>
Install an SSH client on your Windows machine. As a user, the best
non-free one I've found is from <literal>SecureCRT</literal> from
- <ulink url="http://www.vandyke.com/">http://www.vandyke.com/</ulink>.
- Another option is <literal>f-secure</literal> from
- <ulink url="http://www.f-secure.com/">http://www.f-secure.com/</ulink>.
- You can also find some free ones on <literal>Google</literal> at
- <ulink url="http://directory.google.com/Top/Computers/Security/Products_and_Tools/Cryptography/SSH/Clients/Windows/">http://directory.google.com/Top/Computers/Security/Products_and_Tools/Cryptography/SSH/Clients/Windows/</ulink>.
+ <ulink url="http://www.vandyke.com/"/>. Another option is
+ <literal>f-secure</literal> from
+ <ulink url="http://www.f-secure.com/"/>. You can also find some
+ free ones on <literal>Google</literal> at
+ <ulink url="http://directory.google.com/Top/Computers/Security/Products_and_Tools/Cryptography/SSH/Clients/Windows/"/>.
</para></listitem>
<listitem><para>
@@ -20640,8 +20640,8 @@
If your system doesn't have a zoneinfo database (for example,
Windows or HP-UX), you can use the package of pre-built time zone
tables that is available for download at
- <ulink url="http://dev.mysql.com/downloads/timezones.html">http://dev.mysql.com/downloads/timezones.html</ulink>.
- This package contains <filename>.frm</filename>,
+ <ulink url="http://dev.mysql.com/downloads/timezones.html"/>. This
+ package contains <filename>.frm</filename>,
<filename>.MYD</filename>, and <filename>.MYI</filename> files for
the <literal>MyISAM</literal> time zone tables. These tables should
belong to the <literal>mysql</literal> database, so you should place
@@ -22753,10 +22753,11 @@
<para>
When setting <literal>query_cache_size</literal> to a non-zero value
keep in mind that the query cache needs a minimum size of about 40KB
- to allocate its structures. (The exact size depends on
+ to allocate its structures. (The exact size depends on
architecture.) If you set the value too small, you'll get a warning,
like in this example:
- <programlisting>
+
+<programlisting>
mysql> <userinput>SET GLOBAL query_cache_size = 40000;</userinput>
Query OK, 0 rows affected, 1 warning (0.00 sec)
--- 1.1/refman-5.0/mysql-floss-license-exception.xml 2005-06-16 14:46:21 -05:00
+++ 1.2/refman-5.0/mysql-floss-license-exception.xml 2005-07-14 15:11:32 -05:00
@@ -300,10 +300,10 @@
Due to the many variants of some of the above licenses, we require
that any version follow the 2003 version of the Free Software
Foundation's Free Software Definition
- (<ulink url="http://www.gnu.org/philosophy/free-sw.html">http://www.gnu.org/philosophy/free-sw.html</ulink>)
- or version 1.9 of the Open Source Definition by the Open Source
+ (<ulink url="http://www.gnu.org/philosophy/free-sw.html"/>) or
+ version 1.9 of the Open Source Definition by the Open Source
Initiative
- (<ulink url="http://www.opensource.org/docs/definition.php">http://www.opensource.org/docs/definition.php</ulink>).
+ (<ulink url="http://www.opensource.org/docs/definition.php"/>).
</para></listitem>
<listitem><para>
--- 1.1/refman-5.0/mysql-optimization.xml 2005-06-16 14:46:21 -05:00
+++ 1.2/refman-5.0/mysql-optimization.xml 2005-07-14 15:11:32 -05:00
@@ -212,10 +212,9 @@
<para>
For <literal>crash-me</literal> results, visit
- <ulink url="http://dev.mysql.com/tech-resources/crash-me.php">http://dev.mysql.com/tech-resources/crash-me.php</ulink>.
- See
- <ulink url="http://dev.mysql.com/tech-resources/benchmarks/">http://dev.mysql.com/tech-resources/benchmarks/</ulink>
- for the results from the benchmarks.
+ <ulink url="http://dev.mysql.com/tech-resources/crash-me.php"/>. See
+ <ulink url="http://dev.mysql.com/tech-resources/benchmarks/"/> for
+ the results from the benchmarks.
</para>
<para>
@@ -402,8 +401,8 @@
<listitem><para>
The benchmark suite is provided with MySQL source distributions.
You can either download a released distribution from
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>,
- or use the current development source tree (see
+ <ulink url="http://dev.mysql.com/downloads/"/>, or use the current
+ development source tree (see
<xref linkend="installing-source-tree"/>).
</para></listitem>
@@ -481,9 +480,9 @@
<para>
You can find the results from <literal>crash-me</literal> for many
different database servers at
- <ulink url="http://dev.mysql.com/tech-resources/crash-me.php">http://dev.mysql.com/tech-resources/crash-me.php</ulink>.
- For more information about benchmark results, visit
- <ulink url="http://dev.mysql.com/tech-resources/benchmarks/">http://dev.mysql.com/tech-resources/benchmarks/</ulink>.
+ <ulink url="http://dev.mysql.com/tech-resources/crash-me.php"/>. For
+ more information about benchmark results, visit
+ <ulink url="http://dev.mysql.com/tech-resources/benchmarks/"/>.
</para>
</section>
@@ -521,8 +520,7 @@
<para>
Another free benchmark suite is the Open Source Database Benchmark,
- available at
- <ulink url="http://osdb.sourceforge.net/">http://osdb.sourceforge.net/</ulink>.
+ available at <ulink url="http://osdb.sourceforge.net/"/>.
</para>
<para>
@@ -541,9 +539,9 @@
To avoid problems like this, you should put some effort into
benchmarking your whole application under the worst possible load!
You can use Super Smack for this. It is available at
- <ulink url="http://jeremy.zawodny.com/mysql/super-smack/">http://jeremy.zawodny.com/mysql/super-smack/</ulink>.
- As the name suggests, it can bring a system to its knees if you ask
- it, so make sure to use it only on your development systems.
+ <ulink url="http://jeremy.zawodny.com/mysql/super-smack/"/>. As the
+ name suggests, it can bring a system to its knees if you ask it, so
+ make sure to use it only on your development systems.
</para>
</section>
--- 1.8/refman-5.0/ndbcluster.xml 2005-07-01 13:58:39 -05:00
+++ 1.9/refman-5.0/ndbcluster.xml 2005-07-14 15:11:32 -05:00
@@ -52,8 +52,7 @@
This chapter represents a work in progress, and its contents are
subject to revision as MySQL Cluster continues to evolve. Additional
information regarding MySQL Cluster can be found on the MySQL AB Web
- site at
- <ulink url="http://www.mysql.com/products/cluster/">http://www.mysql.com/products/cluster/</ulink>.
+ site at <ulink url="http://www.mysql.com/products/cluster/"/>.
</para>
<para>
@@ -64,8 +63,8 @@
<itemizedlist>
<listitem><para>
- the MySQL Cluster
- <ulink url="mailing list">http://lists.mysql.com/cluster</ulink>.
+ the MySQL Cluster <ulink url="http://lists.mysql.com/cluster">mailing
+ list</ulink>.
</para></listitem>
<listitem><para>
@@ -309,11 +308,11 @@
<title id='title-multi-computer'>&title-multi-computer;</title>
<para>
- This section is a "How-To" in which we describe the basics for
- how to plan, install, configure, and run a viable MySQL Cluster.
- Unlike the example in <xref linkend="mysql-cluster-configuration"/>,
- the result of following the guidelines and procedures outlined below
- should be a usable MySQL Cluster which meets minimum requirements for
+ This section is a "How-To" in which we describe the basics for how to
+ plan, install, configure, and run a viable MySQL Cluster. Unlike the
+ example in <xref linkend="mysql-cluster-configuration"/>, the result
+ of following the guidelines and procedures outlined below should be a
+ usable MySQL Cluster which meets minimum requirements for
availability and safeguarding of data.
</para>
@@ -494,8 +493,7 @@
merely to be able to use Cluster. In this How-To, we will assume
that you are using the <literal>-max</literal> binary appropriate to
your operating system, available via the MySQL software downloads
- page at
- <ulink url="http://dev.mysql.com/downloads">http://dev.mysql.com/downloads</ulink>.
+ page at <ulink url="http://dev.mysql.com/downloads"/>.
</para>
<para>
@@ -874,9 +872,8 @@
<para>
(<emphasis role="bold">NOTE</emphasis>: The "world" database can be
- downloaded from
- <ulink url="http://dev.mysql.com/doc/">http://dev.mysql.com/doc/</ulink>
- where it can be found listed under "Examples".)
+ downloaded from <ulink url="http://dev.mysql.com/doc/"/> where it
+ can be found listed under "Examples".)
</para>
<para>
@@ -1980,8 +1977,8 @@
Prior to MySQL 4.1.8, the default port was 2200.) This port should
always be available on the network, since it has been assigned by
IANA for this purpose (see
- <ulink url="http://www.iana.org/assignments/port-numbers">http://www.iana.org/assignments/port-numbers</ulink>
- for details).
+ <ulink url="http://www.iana.org/assignments/port-numbers"/> for
+ details).
</para>
<para>
@@ -7846,9 +7843,8 @@
there are no plans to address these in coming releases of 4.1;
however, we will attempt to supply fixes for these issues in MySQL
5.0 and subsequent releases. If you check the Cluster category in the
- MySQL bugs database at
- <ulink url="http://bugs.mysql.com">http://bugs.mysql.com</ulink>, you
- can find known bugs which (if marked 4.1) we intend to correct in
+ MySQL bugs database at <ulink url="http://bugs.mysql.com"/>, you can
+ find known bugs which (if marked 4.1) we intend to correct in
upcoming releases of MySQL 4.1.
</para>
--- 1.1/refman-5.0/porting.xml 2005-06-16 14:46:22 -05:00
+++ 1.2/refman-5.0/porting.xml 2005-07-14 15:11:32 -05:00
@@ -21,8 +21,8 @@
check the list of currently supported operating systems first. See
<xref linkend="which-os"/>. If you have created a new port of MySQL,
please let us know so that we can list it here and on our Web site
- (<ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink>),
- recommending it to other users.
+ (<ulink url="http://www.mysql.com/"/>), recommending it to other
+ users.
</para>
<para>
@@ -42,25 +42,24 @@
The hard part of porting to a new Unix variant without good native
thread support is probably to port MIT-pthreads. See
<filename>mit-pthreads/README</filename> and Programming POSIX Threads
- (<ulink url="http://www.humanfactor.com/pthreads/">http://www.humanfactor.com/pthreads/</ulink>).
+ (<ulink url="http://www.humanfactor.com/pthreads/"/>).
</para>
<para>
Up to MySQL 4.0.2, the MySQL distribution included a patched version
of Chris Provenzano's Pthreads from MIT (see the MIT Pthreads Web page
- at
- <ulink url="http://www.mit.edu/afs/sipb/project/pthreads/">http://www.mit.edu/afs/sipb/project/pthreads/</ulink>
- and a programming introduction at
- <ulink url="http://www.mit.edu:8001/people/proven/IAP_2000/">http://www.mit.edu:8001/people/proven/IAP_2000/</ulink>).
- These can be used for some operating systems that do not have POSIX
- threads. See <xref linkend="mit-pthreads"/>.
+ at <ulink url="http://www.mit.edu/afs/sipb/project/pthreads/"/> and a
+ programming introduction at
+ <ulink url="http://www.mit.edu:8001/people/proven/IAP_2000/"/>). These
+ can be used for some operating systems that do not have POSIX threads.
+ See <xref linkend="mit-pthreads"/>.
</para>
<para>
It is also possible to use another user level thread package named FSU
Pthreads (see
- <ulink url="http://moss.csc.ncsu.edu/~mueller/pthreads/">http://moss.csc.ncsu.edu/~mueller/pthreads/</ulink>).
- This implementation is being used for the SCO port.
+ <ulink url="http://moss.csc.ncsu.edu/~mueller/pthreads/"/>). This
+ implementation is being used for the SCO port.
</para>
<para>
@@ -341,8 +340,8 @@
the trace file to the appropriate mailing list where something seems
to go wrong! If you can't locate the wrong place, you can ftp the
trace file, together with a full bug report, to
- <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
- so that a MySQL developer can take a look a this.
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> so that a MySQL
+ developer can take a look a this.
</para>
<para>
@@ -681,8 +680,8 @@
If this doesn't help and you can't find anything in the
<literal>mysql</literal> mail archive, you should report the bug to
a MySQL mailing list. The mailing lists are described at
- <ulink url="http://lists.mysql.com/">http://lists.mysql.com/</ulink>,
- which also has links to online list archives.
+ <ulink url="http://lists.mysql.com/"/>, which also has links to
+ online list archives.
</para>
<para>
@@ -781,14 +780,11 @@
<command>mysqld</command> to die with the above command, you 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/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
- and enter it into our bugs system at
- <ulink url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>.
- If you are a support customer, you can use the MySQL Customer
- Support Center
- <ulink url="https://support.mysql.com/">https://support.mysql.com/</ulink>
- to alert the MySQL team about the problem and have it fixed as soon
- as possible.
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> and enter it
+ into our bugs system at <ulink url="http://bugs.mysql.com/"/>. If
+ you are a support customer, you can use the MySQL Customer Support
+ Center <ulink url="https://support.mysql.com/"/> to alert the MySQL
+ team about the problem and have it fixed as soon as possible.
</para></listitem>
</itemizedlist>
--- 1.4/refman-5.0/problems.xml 2005-07-09 10:37:18 -05:00
+++ 1.5/refman-5.0/problems.xml 2005-07-14 15:11:32 -05:00
@@ -537,7 +537,7 @@
configuration of MySQL need be done in order to use this newer MySQL
client library for PHP. For more information about the
<literal>mysqli</literal> extension, see
- <ulink url="http://php.net/mysqli">http://php.net/mysqli</ulink>.
+ <ulink url="http://php.net/mysqli"/>.
</para>
<para>
@@ -4248,8 +4248,8 @@
</para></listitem>
<listitem><para>
- When inserting a big integer value (between 2^63 and 2^64−1) into a
- decimal or string column, it is inserted as a negative value
+ When inserting a big integer value (between 2^63 and 2^64−1) into
+ a decimal or string column, it is inserted as a negative value
because the number is evaluated in a signed integer context.
</para></listitem>
--- 1.2/refman-5.0/spatial-extensions-in-mysql.xml 2005-07-13 20:02:53 -05:00
+++ 1.3/refman-5.0/spatial-extensions-in-mysql.xml 2005-07-14 15:11:32 -05:00
@@ -74,18 +74,17 @@
universities participating in the development of publicly available
conceptual solutions that can be useful with all kinds of
applications that manage spatial data. The OGC maintains a Web site
- at
- <ulink url="http://www.opengis.org/">http://www.opengis.org/</ulink>.
+ at <ulink url="http://www.opengis.org/"/>.
</para>
<para>
- In 1997, the Open GIS Consortium published the <citetitle>OpenGIS®
- Simple Features Specifications For SQL</citetitle>, a document that
- proposes several conceptual ways for extending an SQL RDBMS to
- support spatial data. This specification is available from the Open
- GIS Web site at
- <ulink url="http://www.opengis.org/docs/99-049.pdf">http://www.opengis.org/docs/99-049.pdf</ulink>.
- It contains additional information relevant to this chapter.
+ In 1997, the Open GIS Consortium published the
+ <citetitle>OpenGIS® Simple Features Specifications For
+ SQL</citetitle>, a document that proposes several conceptual ways for
+ extending an SQL RDBMS to support spatial data. This specification is
+ available from the Open GIS Web site at
+ <ulink url="http://www.opengis.org/docs/99-049.pdf"/>. It contains
+ additional information relevant to this chapter.
</para>
<para>
--- 1.6/refman-5.0/storage-engines.xml 2005-07-14 06:56:45 -05:00
+++ 1.7/refman-5.0/storage-engines.xml 2005-07-14 15:11:32 -05:00
@@ -140,71 +140,71 @@
<itemizedlist>
<listitem><para>
- <literal>MyISAM</literal> manages non-transactional tables. It
- provides high-speed storage and retrieval, as well as fulltext
- searching capabilities. <literal>MyISAM</literal> is supported in all
- MySQL configurations, and is the default storage engine unless you
+ <literal>MyISAM</literal> manages non-transactional tables. It
+ provides high-speed storage and retrieval, as well as fulltext
+ searching capabilities. <literal>MyISAM</literal> is supported in all
+ MySQL configurations, and is the default storage engine unless you
have configured MySQL to use a different one by default.
</para></listitem>
<listitem><para>
- The <literal>MEMORY</literal> storage engine provides in-memory
- tables. The <literal>MERGE</literal> storage engine allows a
- collection of identical <literal>MyISAM</literal> tables to be
- handled as a single table. Like <literal>MyISAM</literal>, the
- <literal>MEMORY</literal> and <literal>MERGE</literal> storage
- engines handle non-transactional tables, and both are also
- included in MySQL by default.
- </para>
-
- <para><emphasis role="bold">Note</emphasis>: The
- <literal>MEMORY</literal> storage engine was formerly known as the
- <literal>HEAP</literal> engine.
- </para>
- </listitem>
+ The <literal>MEMORY</literal> storage engine provides in-memory
+ tables. The <literal>MERGE</literal> storage engine allows a
+ collection of identical <literal>MyISAM</literal> tables to be
+ handled as a single table. Like <literal>MyISAM</literal>, the
+ <literal>MEMORY</literal> and <literal>MERGE</literal> storage
+ engines handle non-transactional tables, and both are also included
+ in MySQL by default.
+ </para>
+
+ <para>
+ <emphasis role="bold">Note</emphasis>: The <literal>MEMORY</literal>
+ storage engine was formerly known as the <literal>HEAP</literal>
+ engine.
+ </para></listitem>
<listitem><para>
The <literal>InnoDB</literal> and <literal>BDB</literal> storage
- engines provide transaction-safe tables. <literal>BDB</literal> is
- included in MySQL-Max binary distributions on those operating systems
- that support it. <literal>InnoDB</literal> also included by default
- in all MySQL 5.0 binary distributions. In source distributions, you
+ engines provide transaction-safe tables. <literal>BDB</literal> is
+ included in MySQL-Max binary distributions on those operating systems
+ that support it. <literal>InnoDB</literal> also included by default
+ in all MySQL 5.0 binary distributions. In source distributions, you
can enable or disable either engine by configuring MySQL as you like.
</para></listitem>
<listitem><para>
- The <literal>EXAMPLE</literal> storage engine is a "stub"
- engine that does nothing. You can create tables with this engine,
- but no data can be stored into them or retrieved from them. The
- purpose of this engine is to serve as an example in the MySQL source
- code that illustrates how to begin writing new storage engines. As
- such, it is primarily of interest to developers.
+ The <literal>EXAMPLE</literal> storage engine is a "stub"
+ engine that does nothing. You can create tables with this engine, but
+ no data can be stored into them or retrieved from them. The purpose
+ of this engine is to serve as an example in the MySQL source code
+ that illustrates how to begin writing new storage engines. As such,
+ it is primarily of interest to developers.
</para></listitem>
<listitem><para>
<literal>NDB Cluster</literal> is the storage engine used by MySQL
Cluster to implement tables that are partitioned over many computers.
- It is available in MySQL-Max 5.0 binary distributions. This storage
- engine is currently supported on Linux, Solaris, and Mac OS X only.
- We intend to add support for this engine on other platforms,
+ It is available in MySQL-Max 5.0 binary distributions. This storage
+ engine is currently supported on Linux, Solaris, and Mac OS X only.
+ We intend to add support for this engine on other platforms,
including Windows, in future MySQL releases.
</para></listitem>
<listitem><para>
- The <literal>ARCHIVE</literal> storage engine is used for storing
+ The <literal>ARCHIVE</literal> storage engine is used for storing
large amounts of data without indexes with a very small footprint.
</para></listitem>
<listitem><para>
- The <literal>CSV</literal> storage engine stores data in text files
+ The <literal>CSV</literal> storage engine stores data in text files
using comma-separated-values format.
</para></listitem>
<listitem><para>
The <literal>FEDERATED</literal> storage engine was added in MySQL
5.0.3. This engine stores data in a remote database. In this release,
- it works with MySQL only, using the MySQL C Client API. In future
- releases, it will be able to connect to other data sources using
+ it works with MySQL only, using the MySQL C Client API. In future
+ releases, it will be able to connect to other data sources using
other driver or client connection methods.
</para></listitem>
@@ -230,7 +230,7 @@
</programlisting>
<para>
- While <literal>TYPE</literal> is still supported in MySQL 5.0,
+ While <literal>TYPE</literal> is still supported in MySQL 5.0,
<literal>ENGINE</literal> is now the preferred term.
</para>
@@ -290,8 +290,8 @@
<para>
This automatic substitution of the <literal>MyISAM</literal> table
type when an unavailable type is specified can be confusing for new
- MySQL users. In MySQL 5.0, a warning is generated when a table
- type is automatically changed.
+ MySQL users. In MySQL 5.0, a warning is generated when a table type is
+ automatically changed.
</para>
<para>
@@ -345,8 +345,8 @@
</itemizedlist>
<para>
- In MySQL 5.0, <literal>InnoDB</literal> uses default configuration
- values if you specify none. See
+ In MySQL 5.0, <literal>InnoDB</literal> uses default configuration
+ values if you specify none. See
<xref linkend="innodb-configuration"/>.
</para>
@@ -396,9 +396,9 @@
</indexterm>
<para>
- <literal>MyISAM</literal> is the default storage engine. It is based
- on the older <literal>ISAM</literal> code but has many useful
- extensions. (Note that MySQL 5.0 does not support
+ <literal>MyISAM</literal> is the default storage engine. It is based
+ on the older <literal>ISAM</literal> code but has many useful
+ extensions. (Note that MySQL 5.0 does not support
<literal>ISAM</literal>.)
</para>
@@ -407,8 +407,8 @@
files. The files have names that begin with the table name and have
an extension to indicate the file type. An <filename>.frm</filename>
file stores the table definition. The data file has an
- <filename>.MYD</filename> (<literal>MYData</literal>) extension. The
- index file has an <filename>.MYI</filename>
+ <filename>.MYD</filename> (<literal>MYData</literal>) extension. The
+ index file has an <filename>.MYI</filename>
(<literal>MYIndex</literal>) extension.
</para>
@@ -422,17 +422,16 @@
</programlisting>
<para>
- (<emphasis role="bold">Note</emphasis>: Older versions of MySQL used
- <literal>TYPE</literal> rather than <literal>ENGINE</literal> (for
- example: <literal>TYPE = MYISAM</literal>). MySQL 5.0 supports this
- syntax for backwards compatibility but <literal>TABLE</literal> is
- now deprecated and <literal>ENGINE</literal> is the preferred
- usage.)
+ (<emphasis role="bold">Note</emphasis>: Older versions of MySQL used
+ <literal>TYPE</literal> rather than <literal>ENGINE</literal> (for
+ example: <literal>TYPE = MYISAM</literal>). MySQL 5.0 supports this
+ syntax for backwards compatibility but <literal>TABLE</literal> is
+ now deprecated and <literal>ENGINE</literal> is the preferred usage.)
</para>
<para>
- Normally, the <literal>ENGINE</literal> option is unnecessary;
- <literal>MyISAM</literal> is the default storage engine unless the
+ Normally, the <literal>ENGINE</literal> option is unnecessary;
+ <literal>MyISAM</literal> is the default storage engine unless the
default has been changed.
</para>
@@ -445,7 +444,7 @@
</para>
<para>
- The following are some characteristics of the
+ The following are some characteristics of the
<literal>MyISAM</literal> storage engine:
</para>
@@ -483,14 +482,14 @@
</para></listitem>
<listitem><para>
- The maximum number of indexes per <literal>MyISAM</literal> table in
- MySQL 5.0 is 64. This can be changed by recompiling. The maximum
+ The maximum number of indexes per <literal>MyISAM</literal> table in
+ MySQL 5.0 is 64. This can be changed by recompiling. The maximum
number of columns per index is 16.
</para></listitem>
<listitem><para>
- The maximum key length is 1000 bytes. This can also be changed by
- recompiling. For the case of a key longer than 250 bytes, a larger
+ The maximum key length is 1000 bytes. This can also be changed by
+ recompiling. For the case of a key longer than 250 bytes, a larger
key block size than the default of 1024 bytes is used.
</para></listitem>
@@ -519,10 +518,10 @@
<listitem><para>
Internal handling of one <literal>AUTO_INCREMENT</literal> column
per table. <literal>MyISAM</literal> automatically updates this
- column for <literal>INSERT</literal>and <literal>UPDATE</literal>
- operations. This makes <literal>AUTO_INCREMENT</literal> columns
- faster (at least 10%). Values at the top of the sequence are not
- reused after being deleted. (When an
+ column for <literal>INSERT</literal>and <literal>UPDATE</literal>
+ operations. This makes <literal>AUTO_INCREMENT</literal> columns
+ faster (at least 10%). Values at the top of the sequence are not
+ reused after being deleted. (When an
<literal>AUTO_INCREMENT</literal> column is defined as the last
column of a multiple-column index, reuse of values deleted from the
top of a sequence does occur.) The <literal>AUTO_INCREMENT</literal>
@@ -531,8 +530,8 @@
</para></listitem>
<listitem><para>
- If a table has no free blocks in the middle of the data file, you
- can <literal>INSERT</literal> new rows into it at the same time that
+ If a table has no free blocks in the middle of the data file, you
+ can <literal>INSERT</literal> new rows into it at the same time that
other threads are reading from the table. (These are known as
concurrent inserts.) A free block can occur as a result of deleting
rows or an update of a dynamic length row with more data than its
@@ -548,7 +547,7 @@
</para></listitem>
<listitem><para>
- Each character column can have a different character set. See
+ Each character column can have a different character set. See
<xref linkend="charset"/>.
</para></listitem>
@@ -562,10 +561,9 @@
</para></listitem>
<listitem><para>
- <command>myisamchk</command> marks tables as checked if run using
- the <literal>--update-state</literal> option.
- <command>myisamchk --fast</command> checks only those tables that
- don't have this mark.
+ <command>myisamchk</command> marks tables as checked if run using
+ the <literal>--update-state</literal> option. <command>myisamchk
+ --fast</command> checks only those tables that don't have this mark.
</para></listitem>
<listitem><para>
@@ -682,7 +680,7 @@
<para>
Used to help MySQL to decide when to use the slow but safe key
cache index creation method. <emphasis role="bold">Note</emphasis>:
- This was parameter was given in bytes before MySQL 5.0.6, when it
+ This was parameter was given in bytes before MySQL 5.0.6, when it
was removed.
</para></listitem>
@@ -693,7 +691,7 @@
<para>
Don't use the fast sort index method to create an index if the
temporary file would become larger than this.
- <emphasis role="bold">Note</emphasis>: In MySQL 5.0, this parameter
+ <emphasis role="bold">Note</emphasis>: In MySQL 5.0, this parameter
is given in bytes.
</para></listitem>
@@ -840,7 +838,7 @@
</para>
<para>
- You can compress or decompress tables by specifying
+ You can compress or decompress tables by specifying
<literal>ROW_FORMAT={COMPRESSED | DEFAULT}</literal> with
<literal>ALTER TABLE</literal>. See <xref linkend="create-table"/>.
</para>
@@ -1021,8 +1019,8 @@
There is a penalty of 6 bytes for each link. A dynamic record is
linked whenever an update causes an enlargement of the record.
Each new link is at least 20 bytes, so the next enlargement
- probably goes in the same link. If not, another link is created.
- You can find the number of links using <command>myisamchk
+ probably goes in the same link. If not, another link is created.
+ You can find the number of links using <command>myisamchk
-ed</command>. All links may be removed with <command>myisamchk
-r</command>.
</para></listitem>
@@ -1059,8 +1057,8 @@
</para>
<para>
- All MySQL distributions include <command>myisampack</command> by
- default. Compressed tablescan be uncompressed with
+ All MySQL distributions include <command>myisampack</command> by
+ default. Compressed tablescan be uncompressed with
<command>myisamchk</command>.
</para>
@@ -1112,7 +1110,7 @@
</para></listitem>
<listitem><para>
- A column may use any combination of the preceding compression
+ A column may use any combination of the preceding compression
types.
</para></listitem>
@@ -1198,8 +1196,8 @@
</itemizedlist>
<para>
- You can check the health of a <literal>MyISAM</literal> table using
- the <literal>CHECK TABLE</literal> statement, and repair a
+ You can check the health of a <literal>MyISAM</literal> table using
+ the <literal>CHECK TABLE</literal> statement, and repair a
corrupted <literal>MyISAM</literal> table with <literal>REPAIR
TABLE</literal>. When <command>mysqld</command> is not running, you
can also check or repair a table with the
@@ -1289,9 +1287,9 @@
<itemizedlist>
<listitem><para>
- The <literal>MyISAM</literal> tables are copied without first
- issuing <literal>LOCK TABLES</literal> and <literal>FLUSH
- TABLES</literal>.
+ The <literal>MyISAM</literal> tables are copied without first
+ issuing <literal>LOCK TABLES</literal> and <literal>FLUSH
+ TABLES</literal>.
</para></listitem>
<listitem><para>
@@ -1307,7 +1305,7 @@
</para></listitem>
<listitem><para>
- Multiple <command>mysqld</command> servers are using the table and
+ Multiple <command>mysqld</command> servers are using the table and
one server performed a <literal>REPAIR TABLE</literal> or
<literal>CHECK TABLE</literal> on the table while it was in use by
another server. In this setup, it is safe to use <literal>CHECK
@@ -1366,13 +1364,13 @@
<!-- description_for_help_topic MERGE -->
<para>
- The <literal>MERGE</literal> storage engine, also known as the
+ The <literal>MERGE</literal> storage engine, also known as the
<literal>MRG_MyISAM</literal> engine, is a collection of identical
<literal>MyISAM</literal> tables that can be used as one.
- "Identical" means that all tables have identical column and
- index information. You cannot merge tables in which the columns are
- listed in a different order, don't have exactly the same columns, or
- have the indexes in different order. However, any or all of the
+ "Identical" means that all tables have identical column and
+ index information. You cannot merge tables in which the columns are
+ listed in a different order, don't have exactly the same columns, or
+ have the indexes in different order. However, any or all of the
tables can be compressed with <command>myisampack</command>. See
<xref linkend="myisampack"/>. Differences in table options such as
<literal>AVG_ROW_LENGTH</literal>, <literal>MAX_ROWS</literal>, or
@@ -1387,13 +1385,13 @@
and have an extension to indicate the file type. An
<filename>.frm</filename> file stores the table definition, and an
<filename>.MRG</filename> file contains the names of the tables that
- should be used as one. The tables do not have to be in the
- same database as the <literal>MERGE</literal> table itself.
+ should be used as one. The tables do not have to be in the same
+ database as the <literal>MERGE</literal> table itself.
</para>
<para>
You can use <literal>SELECT</literal>, <literal>DELETE</literal>,
- <literal>UPDATE</literal>, and <literal>INSERT</literal> on the
+ <literal>UPDATE</literal>, and <literal>INSERT</literal> on the
collection of tables. You must have <literal>SELECT</literal>,
<literal>UPDATE</literal>, and <literal>DELETE</literal> privileges
on the tables that you map to a <literal>MERGE</literal> table.
@@ -1407,15 +1405,15 @@
<para>
When you create a <literal>MERGE</literal> table, you must specify a
- <literal>UNION=(<replaceable>list-of-tables</replaceable>)</literal>
- clause that indicates which tables you want to use as one. You can
- optionally specify an <literal>INSERT_METHOD</literal> option if you
- want inserts for the <literal>MERGE</literal> table to take place in
- the first or last table of the <literal>UNION</literal> list. Use a
- value of <literal>FIRST</literal> or <literal>LAST</literal> to cause
- inserts to be made in the first or last table, respectively. If you
- do not specify an <literal>INSERT_METHOD</literal> option or if you
- specify it with a value of <literal>NO</literal>, attempts to insert
+ <literal>UNION=(<replaceable>list-of-tables</replaceable>)</literal>
+ clause that indicates which tables you want to use as one. You can
+ optionally specify an <literal>INSERT_METHOD</literal> option if you
+ want inserts for the <literal>MERGE</literal> table to take place in
+ the first or last table of the <literal>UNION</literal> list. Use a
+ value of <literal>FIRST</literal> or <literal>LAST</literal> to cause
+ inserts to be made in the first or last table, respectively. If you
+ do not specify an <literal>INSERT_METHOD</literal> option or if you
+ specify it with a value of <literal>NO</literal>, attempts to insert
records into the <literal>MERGE</literal> table result in an error.
</para>
@@ -1451,7 +1449,7 @@
</para>
<para>
- After creating the <literal>MERGE</literal> table, you can issue
+ After creating the <literal>MERGE</literal> table, you can issue
queries that operate on the group of tables as a whole:
</para>
@@ -1482,15 +1480,15 @@
<para>
To remap a <literal>MERGE</literal> table to a different collection
- of <literal>MyISAM</literal> tables, you can perform one of the
+ of <literal>MyISAM</literal> tables, you can perform one of the
following:
</para>
<itemizedlist>
<listitem><para>
- <literal>DROP</literal> the <literal>MERGE</literal> table
- and re-create it.
+ <literal>DROP</literal> the <literal>MERGE</literal> table and
+ re-create it.
</para></listitem>
<listitem><para>
@@ -1529,9 +1527,9 @@
</para></listitem>
<listitem><para>
- Perform more efficient searches. If you know exactly what you are
- looking for, you can search in just one of the split tables for some
- queries and use a <literal>MERGE</literal> table for others. You can
+ Perform more efficient searches. If you know exactly what you are
+ looking for, you can search in just one of the split tables for some
+ queries and use a <literal>MERGE</literal> table for others. You can
even have many different <literal>MERGE</literal> tables that use
overlapping sets of tables.
</para></listitem>
@@ -1600,10 +1598,10 @@
underlying tables to check which one most closely matches the given
key. If you then do a read-next, the <literal>MERGE</literal>
storage engine needs to search the read buffers to find the next
- key. Only when one key buffer is used up does the storage engine
- need to read the next key block. This makes <literal>MERGE</literal>
+ key. Only when one key buffer is used up does the storage engine
+ need to read the next key block. This makes <literal>MERGE</literal>
keys much slower on <literal>eq_ref</literal> searches, but not much
- slower on <literal>ref</literal> searches. See
+ slower on <literal>ref</literal> searches. See
<xref linkend="explain"/> for more information about
<literal>eq_ref</literal> and <literal>ref</literal>.
</para></listitem>
@@ -1639,12 +1637,12 @@
<literal>WHERE</literal> clause, <literal>REPAIR TABLE</literal>,
<literal>TRUNCATE TABLE</literal>, <literal>OPTIMIZE
TABLE</literal>, or <literal>ANALYZE TABLE</literal> on any of the
- tables that are mapped into an open <literal>MERGE</literal> table.
- If you do so, the <literal>MERGE</literal> table may still refer to
- the original table, which yields unexpected results. The easiest
- way to work around this deficiency is to issue a <literal>FLUSH
- TABLES</literal> statement prior to performing any of these
- operations to ensure that no <literal>MERGE</literal> tables remain
+ tables that are mapped into an open <literal>MERGE</literal> table.
+ If you do so, the <literal>MERGE</literal> table may still refer to
+ the original table, which yields unexpected results. The easiest
+ way to work around this deficiency is to issue a <literal>FLUSH
+ TABLES</literal> statement prior to performing any of these
+ operations to ensure that no <literal>MERGE</literal> tables remain
open.
</para></listitem>
@@ -1661,8 +1659,8 @@
<listitem><para>
When you create a <literal>MERGE</literal> table, there is no check
- to insure that the underlying tables exist and have identical
- structures. When the <literal>MERGE</literal> table is used, MySQL
+ to insure that the underlying tables exist and have identical
+ structures. When the <literal>MERGE</literal> table is used, MySQL
checks that the record length for all mapped tables is equal, but
this is not foolproof. If you create a <literal>MERGE</literal>
table from dissimilar <literal>MyISAM</literal> tables, you are
@@ -1676,18 +1674,18 @@
used in a <literal>MERGE</literal> table, and then use
<literal>ALTER TABLE</literal> to add a non-unique index on the
<literal>MERGE</literal> table, the index ordering is different for
- the tables if there was already a non-unique index in the
- underlying table. (This is because <literal>ALTER TABLE</literal>
+ the tables if there was already a non-unique index in the
+ underlying table. (This is because <literal>ALTER TABLE</literal>
puts <literal>UNIQUE</literal> indexes before non-unique indexes to
- facilitate rapid detection of duplicate keys.) Consequently,
+ facilitate rapid detection of duplicate keys.) Consequently,
queries on tables with such indexes may return unexpected results.
</para></listitem>
<listitem><para>
<literal>DROP TABLE</literal> on a table that is in use by a
<literal>MERGE</literal> table does not work on Windows because the
- <literal>MERGE</literal> storage engine's table mapping is hidden
- from the upper layer of MySQL. Since Windows does not allow the
+ <literal>MERGE</literal> storage engine's table mapping is hidden
+ from the upper layer of MySQL. Since Windows does not allow the
deletion of open files, you first must flush all
<literal>MERGE</literal> tables (with <literal>FLUSH
TABLES</literal>) or drop the <literal>MERGE</literal> table before
@@ -1738,10 +1736,10 @@
<para>
The <literal>MEMORY</literal> storage engine creates tables with
- contents that are stored in memory. These were formerly known as
- <literal>HEAP</literal> tables. In MySQL 5.0,
- <literal>MEMORY</literal> is the preferred term, although
- <literal>HEAP</literal> remains supported for backwards
+ contents that are stored in memory. These were formerly known as
+ <literal>HEAP</literal> tables. In MySQL 5.0,
+ <literal>MEMORY</literal> is the preferred term, although
+ <literal>HEAP</literal> remains supported for backwards
compatibility.
</para>
@@ -1762,18 +1760,18 @@
</programlisting>
<para>
- As indicated by their name, <literal>MEMORY</literal> tables are
- stored in memory and use hash indexes by default. This makes them
- very fast, and very useful for creating temporary tables. However,
- when the server shuts down, all data stored in
- <literal>MEMORY</literal> tables is lost. The tables themselves
- continue to exist because their definitions are stored in
- <filename>.frm</filename> files on disk, but they are empty when the
+ As indicated by their name, <literal>MEMORY</literal> tables are
+ stored in memory and use hash indexes by default. This makes them
+ very fast, and very useful for creating temporary tables. However,
+ when the server shuts down, all data stored in
+ <literal>MEMORY</literal> tables is lost. The tables themselves
+ continue to exist because their definitions are stored in
+ <filename>.frm</filename> files on disk, but they are empty when the
server restarts.
</para>
<para>
- This example shows how you might create, use, and remove a
+ This example shows how you might create, use, and remove a
<literal>MEMORY</literal> table:
</para>
@@ -1793,26 +1791,26 @@
<listitem><para>
Space for <literal>MEMORY</literal> tables is allocated in small
- blocks. Tables use 100% dynamic hashing for inserts. No overflow
- area or extra key space is needed. No extra space is needed for free
- lists. Deleted rows are put in a linked list and are reused when you
- insert new data into the table. <literal>MEMORY</literal> tables
- also have none of the problems commonly associated with deletes plus
+ blocks. Tables use 100% dynamic hashing for inserts. No overflow
+ area or extra key space is needed. No extra space is needed for free
+ lists. Deleted rows are put in a linked list and are reused when you
+ insert new data into the table. <literal>MEMORY</literal> tables
+ also have none of the problems commonly associated with deletes plus
inserts in hashed tables.
</para></listitem>
<listitem><para>
<literal>MEMORY</literal> tables can have up to 32 indexes per table
and 16 columns per index. Previously, the maximum key length
- supported by this storage engine was 255 bytes; as of MySQL 5.0.8,
- <literal>MEMORY</literal> tables support a maximum key length of 500
+ supported by this storage engine was 255 bytes; as of MySQL 5.0.8,
+ <literal>MEMORY</literal> tables support a maximum key length of 500
bytes. (See <xref linkend="news-5-0-8"/>.)
</para></listitem>
<listitem><para>
In MySQL 5.0, the <literal>MEMORY</literal> storage engine
- implements both <literal>HASH</literal> and <literal>BTREE</literal>
- indexes. You can specify one or the other for a given index by
+ implements both <literal>HASH</literal> and <literal>BTREE</literal>
+ indexes. You can specify one or the other for a given index by
adding a <literal>USING</literal> clause as shown here:
</para>
@@ -1862,7 +1860,7 @@
<listitem><para>
<literal>MEMORY</literal> in MySQL 5.0 includes support for both
- <literal>AUTO_INCREMENT</literal> columns and indexes on columns
+ <literal>AUTO_INCREMENT</literal> columns and indexes on columns
that can contain <literal>NULL</literal> values.
</para></listitem>
@@ -1907,10 +1905,9 @@
<listitem><para>
To free memory used by a <literal>MEMORY</literal> table when you no
- longer require its contents, you should execute
- <literal>DELETE FROM</literal> or <literal>TRUNCATE TABLE</literal>,
- or remove the table altogether (using <literal>DROP
- TABLE</literal>).
+ longer require its contents, you should execute <literal>DELETE
+ FROM</literal> or <literal>TRUNCATE TABLE</literal>, or remove the
+ table altogether (using <literal>DROP TABLE</literal>).
</para></listitem>
<listitem><para>
@@ -1918,8 +1915,8 @@
MySQL server starts, you can use the <literal>--init-file</literal>
option. For example, you can put statements such as <literal>INSERT
INTO ... SELECT</literal> or <literal>LOAD DATA INFILE</literal>
- into this file in order to load the table from a persistent data
- source. See <xref linkend="server-options"/> and
+ into this file in order to load the table from a persistent data
+ source. See <xref linkend="server-options"/> and
<xref linkend="load-data"/>.
</para></listitem>
@@ -1928,15 +1925,15 @@
<literal>MEMORY</literal> tables become empty when it is shut down
and restarted. However, a slave is not aware that these tables have
become empty, so it returns out-of-date content if you select data
- from them. In MySQL 5.0, when a <literal>MEMORY</literal> table is
- used on the master for the first time since the master was started,
- a <literal>DELETE FROM</literal> statement is written to the
- master's binary log automatically, thus synchronizing the slave to
- the master again. Note that even with this strategy, the slave still
- has outdated data in the table during the interval between the
- master's restart and its first use of the table. However, if you use
- the <literal>--init-file</literal> option to populate the
- <literal>MEMORY</literal> table on the master at startup, it ensures
+ from them. In MySQL 5.0, when a <literal>MEMORY</literal> table is
+ used on the master for the first time since the master was started,
+ a <literal>DELETE FROM</literal> statement is written to the
+ master's binary log automatically, thus synchronizing the slave to
+ the master again. Note that even with this strategy, the slave still
+ has outdated data in the table during the interval between the
+ master's restart and its first use of the table. However, if you use
+ the <literal>--init-file</literal> option to populate the
+ <literal>MEMORY</literal> table on the master at startup, it ensures
that this time interval is zero.
</para></listitem>
@@ -2005,14 +2002,16 @@
crashes and are also capable of <literal>COMMIT</literal> and
<literal>ROLLBACK</literal> operations on transactions. The MySQL
source distribution comes with a <literal>BDB</literal> distribution
- that is patched to make it work with MySQL. You cannot use a
+ that is patched to make it work with MySQL. You cannot use a
non-patched version of <literal>BDB</literal> with MySQL.
</para>
+
<!-- Is this still true in 5.0? -->
+
<para>
- We at MySQL AB work in close cooperation with Sleepycat to keep the
- quality of the MySQL/BDB interface high. (Even though Berkeley DB is
- in itself very tested and reliable, the MySQL interface is still
+ We at MySQL AB work in close cooperation with Sleepycat to keep the
+ quality of the MySQL/BDB interface high. (Even though Berkeley DB is
+ in itself very tested and reliable, the MySQL interface is still
considered gamma quality. We continue to improve and optimize it.)
</para>
@@ -2020,7 +2019,7 @@
When it comes to support for any problems involving
<literal>BDB</literal> tables, we are committed to helping our users
locate the problem and create reproducible test cases. Any such test
- case is forwarded to Sleepycat, who in turn help us find and fix the
+ case is forwarded to Sleepycat, who in turn help us find and fix the
problem. As this is a two-stage operation, any problems with
<literal>BDB</literal> tables may take a little longer for us to fix
than for other storage engines. However, we anticipate no significant
@@ -2030,8 +2029,7 @@
<para>
For general information about Berkeley DB, please visit the Sleepycat
- Web site,
- <ulink url="http://www.sleepycat.com/">http://www.sleepycat.com/</ulink>.
+ Web site, <ulink url="http://www.sleepycat.com/"/>.
</para>
<section id="bdb-portability">
@@ -2063,20 +2061,20 @@
<listitem><para>
SCO OpenServer
- </para></listitem>
-
- <listitem><para>
+ </para></listitem>
+
+ <listitem><para>
SCO UnixWare 7.1.x
- </para></listitem>
-
- <listitem><para>
+ </para></listitem>
+
+ <listitem><para>
Windows NT/2000/XP
</para></listitem>
</itemizedlist>
<para>
- <literal>BDB</literal> does <emphasis>not</emphasis> work with the
+ <literal>BDB</literal> does <emphasis>not</emphasis> work with the
following operating systems:
</para>
@@ -2145,8 +2143,8 @@
<literal>BDB</literal> support by running
<command>configure</command> with the
<literal>--with-berkeley-db</literal> option in addition to any
- other options that you normally use. Download a MySQL 5.0
- distribution, change location into its top-level directory, and run
+ other options that you normally use. Download a MySQL 5.0
+ distribution, change location into its top-level directory, and run
this command:
</para>
@@ -2156,7 +2154,7 @@
<para>
For more information, see <xref linkend="installing-binary"/>,
- <xref linkend="mysqld-max"/>, and
+ <xref linkend="mysqld-max"/>, and
<xref linkend="installing-source"/>.
</para>
@@ -2246,11 +2244,13 @@
<para>
See <xref linkend="server-options"/>.
</para>
+
<!--
Seems a bit odd to have a single-item list here... This bsaically
just repeats what's show about 2 paras below, so I'm commenting it
out for now
-->
+
<!--
<para>
The following system variable affects the behavior of
@@ -2283,8 +2283,8 @@
<para>
Normally, you should start <command>mysqld</command> without the
<literal>--bdb-no-recover</literal> option if you intend to use
- <literal>BDB</literal> tables. However, this may cause problems
- when you try to start <command>mysqld</command> if the
+ <literal>BDB</literal> tables. However, this may cause problems when
+ you try to start <command>mysqld</command> if the
<literal>BDB</literal> log files are corrupted. See
<xref linkend="starting-server"/>.
</para>
@@ -2303,17 +2303,16 @@
Got error 12 from ...
</programlisting>
- <para>
- You may also want to change the
- <literal>binlog_cache_size</literal> and
- <literal>max_binlog_cache_size</literal> variables if you are
- using large multiple-statement transactions. See
- <xref linkend="binary-log"/>.
- </para>
-
- <para>
- See also <xref linkend="server-system-variables"/>.
- </para>
+ <para>
+ You may also want to change the <literal>binlog_cache_size</literal>
+ and <literal>max_binlog_cache_size</literal> variables if you are
+ using large multiple-statement transactions. See
+ <xref linkend="binary-log"/>.
+ </para>
+
+ <para>
+ See also <xref linkend="server-system-variables"/>.
+ </para>
</section>
@@ -2386,8 +2385,8 @@
<itemizedlist>
<listitem><para>
- In MySQL 5.0, <literal>BDB</literal> tables can have up to 31
- indexes per table, 16 columns per index, and a maximum key size of
+ In MySQL 5.0, <literal>BDB</literal> tables can have up to 31
+ indexes per table, 16 columns per index, and a maximum key size of
1024 bytes.
</para></listitem>
@@ -2397,8 +2396,8 @@
identified. If you don't create one explicitly, MySQL creates and
maintains a hidden <literal>PRIMARY KEY</literal> for you. The
hidden key has a length of five bytes and is incremented for each
- insert attempt. This key does not appear in the output of
- <literal>SHOW CREATE TABLE</literal> or
+ insert attempt. This key does not appear in the output of
+ <literal>SHOW CREATE TABLE</literal> or
<literal>DESCRIBE</literal>.
</para></listitem>
@@ -2472,16 +2471,13 @@
page level.
</para></listitem>
- <listitem>
- <para>
- <literal>LOCK TABLES</literal> works on <literal>BDB</literal>
- tables as with other tables. If you do not use <literal>LOCK
- TABLES</literal>, MySQL issues an internal multiple-write lock
- on the table (a lock that does not block other writers) to
- ensure that the table is properly locked if another thread
- issues a table lock.
- </para>
- </listitem>
+ <listitem><para>
+ <literal>LOCK TABLES</literal> works on <literal>BDB</literal>
+ tables as with other tables. If you do not use <literal>LOCK
+ TABLES</literal>, MySQL issues an internal multiple-write lock on
+ the table (a lock that does not block other writers) to ensure that
+ the table is properly locked if another thread issues a table lock.
+ </para></listitem>
<listitem><para>
To be able to roll back transactions, the <literal>BDB</literal>
@@ -2519,8 +2515,8 @@
<listitem><para>
If you get a full disk with a <literal>BDB</literal> table, you get
an error (probably error 28) and the transaction should roll back.
- This contrasts with <literal>MyISAM</literal> tables, for which
- <command>mysqld</command> waits for sufficient free disk space
+ This contrasts with <literal>MyISAM</literal> tables, for which
+ <command>mysqld</command> waits for sufficient free disk space
before continuing.
</para></listitem>
@@ -2535,7 +2531,7 @@
<itemizedlist>
<listitem><para>
- Opening many <literal>BDB</literal> tables at the same time may be
+ Opening many <literal>BDB</literal> tables at the same time may be
quite slow. If you are going to use <literal>BDB</literal> tables,
you should not have a very large table cache (for example, with a
size larger than 256) and you should use the
@@ -2547,7 +2543,7 @@
<literal>SHOW TABLE STATUS</literal> does not yet provide some
information for <literal>BDB</literal> tables:
</para>
-
+
<programlisting>
mysql> SHOW TABLE STATUS LIKE 'bdbtest'\G
*************************** 1. row ***************************
@@ -2569,9 +2565,7 @@
Checksum: NULL
Create_options:
Comment:
-</programlisting>
-
- </listitem>
+</programlisting></listitem>
<listitem><para>
Optimize performance.
@@ -2699,15 +2693,15 @@
</indexterm>
<para>
- The <literal>EXAMPLE</literal> storage engine is a stub engine that
- does nothing. Its purpose is to serve as an example in the MySQL
- source code that illustrates how to begin writing new storage
+ The <literal>EXAMPLE</literal> storage engine is a stub engine that
+ does nothing. Its purpose is to serve as an example in the MySQL
+ source code that illustrates how to begin writing new storage
engines. As such, it is primarily of interest to developers.
</para>
<para>
To examine the source for the <literal>EXAMPLE</literal> engine, look
- in the <filename>sql/examples</filename> directory of a MySQL 5.0
+ in the <filename>sql/examples</filename> directory of a MySQL 5.0
source distribution.
</para>
@@ -2761,8 +2755,8 @@
</indexterm>
<para>
- The <literal>FEDERATED</literal> storage engine is available
- beginning with MySQL 5.0.3. It is a storage engine that accesses data
+ The <literal>FEDERATED</literal> storage engine is available
+ beginning with MySQL 5.0.3. It is a storage engine that accesses data
in tables of remote databases rather than in local tables.
</para>
@@ -2904,7 +2898,7 @@
</para>
<para>
- Next, create a <literal>FEDERATED</literal> table on the local
+ Next, create a <literal>FEDERATED</literal> table on the local
server for accessing the remote table:
</para>
@@ -2923,11 +2917,11 @@
</programlisting>
<para>
- The structure of this table must be exactly the same as that of the
- remote table, except that the <literal>ENGINE</literal> table option
- should be <literal>FEDERATED</literal> and the
- <literal>COMMENT</literal> table option is a connection string that
- indicates to the <literal>FEDERATED</literal> engine how to connect
+ The structure of this table must be exactly the same as that of the
+ remote table, except that the <literal>ENGINE</literal> table option
+ should be <literal>FEDERATED</literal> and the
+ <literal>COMMENT</literal> table option is a connection string that
+ indicates to the <literal>FEDERATED</literal> engine how to connect
to the remote server.
</para>
@@ -2939,9 +2933,9 @@
<para>
The remote host information indicates the remote server to which
- your local server connects, and the database and table
- information indicates which remote table to use as the data file. In
- this example, the remote server is indicated to be running as
+ your local server connects, and the database and table information
+ indicates which remote table to use as the data file. In this
+ example, the remote server is indicated to be running as
<literal>remote_host</literal> on port 9306, so you want to start
that server so that it listens to port 9306.
</para>
@@ -2957,7 +2951,7 @@
<para>
Only <literal>mysql</literal> is supported as the
- <replaceable>scheme</replaceable> at this point; the password and
+ <replaceable>scheme</replaceable> at this point; the password and
port number are optional.
</para>
@@ -2973,18 +2967,18 @@
<para>
The use of <literal>COMMENT</literal> for specifying the connection
- string is non-optimal and is likely to change in MySQL 5.1. Keep
- this in mind when you use <literal>FEDERATED</literal> tables,
- because it means that modifications are likely to be required when
+ string is non-optimal and is likely to change in MySQL 5.1. Keep
+ this in mind when you use <literal>FEDERATED</literal> tables,
+ because it means that modifications are likely to be required when
that happens.
</para>
<para>
- Because any password used is stored in the connection string as
- plain text, it can be seen by any user who can use <literal>SHOW
- CREATE TABLE</literal> or <literal>SHOW TABLE STATUS</literal> for
- the <literal>FEDERATED</literal> table, or query the
- <literal>TABLES</literal> table in the
+ Because any password used is stored in the connection string as
+ plain text, it can be seen by any user who can use <literal>SHOW
+ CREATE TABLE</literal> or <literal>SHOW TABLE STATUS</literal> for
+ the <literal>FEDERATED</literal> table, or query the
+ <literal>TABLES</literal> table in the
<literal>INFORMATION_SCHEMA</literal> database.
</para>
@@ -2995,8 +2989,8 @@
<title id='title-federated-limitations'>&title-federated-limitations;</title>
<para>
- What the <literal>FEDERATED</literal> storage engine does and
- does not support:
+ What the <literal>FEDERATED</literal> storage engine does and does
+ not support:
</para>
<itemizedlist>
@@ -3015,8 +3009,10 @@
<listitem><para>
It is possible for one <literal>FEDERATED</literal> table to point
- to another, but you must be careful not to create a loop.
+ to another, but you must be careful not to create a loop.
+
<!-- TODO: Colourful but not very professional. Rewrite or cut. -->
+
<!--
You know
and have heard the screeching of audio feedback? You know what you
@@ -3032,10 +3028,10 @@
<listitem><para>
There is no way for the <literal>FEDERATED</literal> engine to know
if the remote table has changed. The reason for this is that this
- table must work like a data file that would never be written to by
- anything other than the database. The integrity of the data in the
- local table could be breached if there was any change to the
- remote database.
+ table must work like a data file that would never be written to by
+ anything other than the database. The integrity of the data in the
+ local table could be breached if there was any change to the remote
+ database.
</para></listitem>
<listitem><para>
@@ -3044,7 +3040,8 @@
<literal>UPDATE</literal>, <literal>DELETE</literal>, and indexes.
It does not support <literal>ALTER TABLE</literal>, <literal>DROP
TABLE</literal>, or any other Data Definition Language statements.
- The current implementation does not use Prepared statements.
+ The current implementation does not use Prepared statements.
+
<!--
It
remains to be seen whether the limited subset of the client API for
@@ -3092,8 +3089,8 @@
</indexterm>
<para>
- The <literal>ARCHIVE</literal> storage engine is used for storing
- large amounts of data without indexes with a relatively small
+ The <literal>ARCHIVE</literal> storage engine is used for storing
+ large amounts of data without indexes with a relatively small
footprint.
</para>
@@ -3116,12 +3113,12 @@
<para>
The <literal>ARCHIVE</literal> engine supports only
- <literal>INSERT</literal> and <literal>SELECT</literal>. This means
- that you cannot perform <literal>DELETE</literal>,
- <literal>REPLACE</literal>, or <literal>update</literal> queries. A
- <literal>SELECT</literal> performs a complete table scan. Records are
- compressed as they are inserted. <literal>OPTIMIZE
- TABLE</literal> can be used to compress the table.
+ <literal>INSERT</literal> and <literal>SELECT</literal>. This means
+ that you cannot perform <literal>DELETE</literal>,
+ <literal>REPLACE</literal>, or <literal>update</literal> queries. A
+ <literal>SELECT</literal> performs a complete table scan. Records are
+ compressed as they are inserted. <literal>OPTIMIZE TABLE</literal>
+ can be used to compress the table.
</para>
<para>
@@ -3148,7 +3145,7 @@
</indexterm>
<para>
- The <literal>CSV</literal> storage engine stores data in text files
+ The <literal>CSV</literal> storage engine stores data in text files
using comma-separated values format.
</para>
@@ -3188,7 +3185,7 @@
<para>
If you examine the <filename>test.CSV</filename> file in the database
- directory created by executing the preceding statements, its contents
+ directory created by executing the preceding statements, its contents
should look like this:
</para>
--- 1.7/refman-5.0/tutorial.xml 2005-07-12 13:37:24 -05:00
+++ 1.8/refman-5.0/tutorial.xml 2005-07-14 15:11:32 -05:00
@@ -626,9 +626,9 @@
some of the queries and sample data used in the following sections
can be obtained from the MySQL Web site. It is available in both
compressed <command>tar</command>
- (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.tar.gz">http://www.mysql.com/Downloads/Contrib/Examples/menagerie.tar.gz</ulink>)
+ (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.tar.gz"/>)
and Zip
- (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.zip">http://www.mysql.com/Downloads/Contrib/Examples/menagerie.zip</ulink>)
+ (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.zip"/>)
formats.
</para>
@@ -3809,7 +3809,7 @@
<para>
More information about Twin studies can be found at:
- <ulink url="http://www.mep.ki.se/twinreg/index_en.html">http://www.mep.ki.se/twinreg/index_en.html</ulink>
+ <ulink url="http://www.mep.ki.se/twinreg/index_en.html"/>
</para>
<para>
--- 1.2/refman/extending-mysql.xml 2005-06-30 19:13:10 -05:00
+++ 1.3/refman/extending-mysql.xml 2005-07-14 15:11:32 -05:00
@@ -120,11 +120,11 @@
</indexterm>
<para>
- The test system that is included in Unix source distributions and
- binary distributions (starting with Version 3.23.29) makes it
- possible for users and developers to perform regression tests on
- the MySQL code. These tests can be run on Unix, or on Windows (using
- the Cygwin environment) if the server has been compiled under Cygwin.
+ The test system that is included in Unix source distributions and
+ binary distributions (starting with Version 3.23.29) makes it
+ possible for users and developers to perform regression tests on the
+ MySQL code. These tests can be run on Unix, or on Windows (using the
+ Cygwin environment) if the server has been compiled under Cygwin.
They cannot currently be run in a native Windows environment.
</para>
@@ -299,7 +299,7 @@
<literal>internals</literal> mailing list. See
<xref linkend="mailing-list"/>. As this list does not accept
attachments, you should ftp all the relevant files to:
- <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/>
</para></listitem>
</itemizedlist>
@@ -348,10 +348,10 @@
<command>mysql-test-run</command> with the
<literal>--debug</literal> option. If this also fails send the
trace file <filename>var/tmp/master.trace</filename> to
- <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
- so that we can examine it. Please remember to also include a full
- description of your system, the version of the
- <command>mysqld</command> binary and how you compiled it.
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> so that we
+ can examine it. Please remember to also include a full description
+ of your system, the version of the <command>mysqld</command>
+ binary and how you compiled it.
</para></listitem>
<listitem><para>
@@ -364,8 +364,8 @@
If you have compiled MySQL yourself, check our manual for how to
compile MySQL on your platform or, preferable, use one of the
binaries we have compiled for you at
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>.
- All our standard binaries should pass the test suite!
+ <ulink url="http://dev.mysql.com/downloads/"/>. All our standard
+ binaries should pass the test suite!
</para></listitem>
<listitem><para>
--- 1.7/refman/functions.xml 2005-07-08 10:50:44 -05:00
+++ 1.8/refman/functions.xml 2005-07-14 15:11:32 -05:00
@@ -2623,8 +2623,7 @@
and create an <literal>INSERT</literal> statement to update the
database with the file contents. If you are using the MySQL++
library, one way to do this can be found in the MySQL++ manual,
- available at
- <ulink url="http://dev.mysql.com/doc/">http://dev.mysql.com/doc/</ulink>.
+ available at <ulink url="http://dev.mysql.com/doc/"/>.
</para>
<para>
--- 1.2/refman/information-schema.xml 2005-06-30 06:38:40 -05:00
+++ 1.3/refman/information-schema.xml 2005-07-14 15:11:32 -05:00
@@ -226,8 +226,9 @@
</para></listitem>
<listitem><para>
- ``Remarks'' provides additional information where applicable.
- <!-- We have marked ``omit'' those columns for which MySQL has no present
+ ``Remarks'' provides additional information where applicable.
+
+<!-- We have marked ``omit'' those columns for which MySQL has no present
use. We have omitted these columns, that is, they appear in the
standard but not in MySQL. So their presence here is a matter of
record only. -->
@@ -242,7 +243,7 @@
<literal>COLLATION</literal> to <literal>TABLE_COLLATION</literal> in
the <literal>TABLES</literal> table.) See the list of reserved words
near the end of this article:
- <ulink url="http://www.dbazine.com/gulutzan5.shtml">http://www.dbazine.com/gulutzan5.shtml</ulink>.
+ <ulink url="http://www.dbazine.com/gulutzan5.shtml"/>.
</para>
<para>
@@ -317,7 +318,7 @@
Database
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>SCHEMA_OWNER</literal>
@@ -328,7 +329,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>DEFAULT_CHARACTER_SET_CATALOG</literal>
@@ -339,7 +340,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>DEFAULT_CHARACTER_SET_SCHEMA</literal>
@@ -476,7 +477,7 @@
<entry/>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>SELF_REFERENCING_COLUMN_NAME</literal>
@@ -487,7 +488,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>REFERENCE_GENERATION</literal>
@@ -498,7 +499,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>USER_DEFINED_TYPE_NAME</literal>
@@ -509,7 +510,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_INSERTABLE_INTO</literal>
@@ -520,7 +521,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_TYPED</literal>
@@ -531,7 +532,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COMMIT_ACTION</literal>
@@ -911,7 +912,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>NUMERIC_PRECISION_RADIX</literal>
@@ -931,7 +932,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>DATETIME_PRECISION</literal>
@@ -942,7 +943,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>INTERVAL_TYPE</literal>
@@ -953,7 +954,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>INTERVAL_PRECISION</literal>
@@ -964,7 +965,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_CATALOG</literal>
@@ -975,7 +976,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_SCHEMA</literal>
@@ -991,10 +992,9 @@
<literal>CHARACTER_SET_NAME</literal>
</entry>
<entry/>
- <entry>
- </entry>
+ <entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_CATALOG</literal>
@@ -1005,7 +1005,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_SCHEMA</literal>
@@ -1025,7 +1025,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>DOMAIN_NAME</literal>
@@ -1036,7 +1036,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>UDT_CATALOG</literal>
@@ -1047,7 +1047,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>UDT_SCHEMA</literal>
@@ -1058,7 +1058,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>UDT_NAME</literal>
@@ -1069,7 +1069,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>SCOPE_CATALOG</literal>
@@ -1080,7 +1080,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>SCOPE_SCHEMA</literal>
@@ -1091,7 +1091,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>SCOPE_NAME</literal>
@@ -1102,7 +1102,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>MAXIMUM_CARDINALITY</literal>
@@ -1113,7 +1113,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>DTD_IDENTIFIER</literal>
@@ -1124,7 +1124,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_SELF_REFERENCING</literal>
@@ -1135,7 +1135,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_IDENTITY</literal>
@@ -1146,7 +1146,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_GENERATION</literal>
@@ -1157,7 +1157,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_START</literal>
@@ -1168,7 +1168,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_INCREMENT</literal>
@@ -1179,7 +1179,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_MAXIMUM</literal>
@@ -1190,7 +1190,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_MINIMUM</literal>
@@ -1201,7 +1201,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IDENTITY_CYCLE</literal>
@@ -1212,7 +1212,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_GENERATED</literal>
@@ -1223,7 +1223,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>GENERATION_EXPRESSION</literal>
@@ -1412,7 +1412,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>TYPE</literal>
@@ -1459,7 +1459,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>PAGES</literal>
@@ -1470,7 +1470,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>FILTER_CONDITION</literal>
@@ -1787,7 +1787,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>GRANTOR</literal>
@@ -1844,7 +1844,7 @@
<entry/>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>WITH_HIERARCHY</literal>
@@ -1912,7 +1912,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>GRANTOR</literal>
@@ -2054,7 +2054,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_CATALOG</literal>
@@ -2065,7 +2065,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_SCHEMA</literal>
@@ -2085,7 +2085,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_REPERTOIRE</literal>
@@ -2096,7 +2096,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>FORM_OF_USE</literal>
@@ -2107,7 +2107,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>NUMBER_OF_CHARACTERS</literal>
@@ -2118,7 +2118,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>DEFAULT_COLLATE_CATALOG</literal>
@@ -2129,7 +2129,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>DEFAULT_COLLATE_SCHEMA</literal>
@@ -2235,7 +2235,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_CATALOG</literal>
@@ -2246,7 +2246,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_SCHEMA</literal>
@@ -2266,7 +2266,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>PAD_ATTRIBUTE</literal>
@@ -2277,7 +2277,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_TYPE</literal>
@@ -2288,7 +2288,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_DEFINITION</literal>
@@ -2299,7 +2299,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_DICTIONARY</literal>
@@ -2310,7 +2310,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_NAME</literal>
@@ -2321,7 +2321,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>ID</literal>
@@ -2332,7 +2332,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_DEFAULT</literal>
@@ -2343,7 +2343,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_COMPILED</literal>
@@ -2354,7 +2354,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>SORTLEN</literal>
@@ -2433,7 +2433,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_CATALOG</literal>
@@ -2444,7 +2444,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>COLLATION_SCHEMA</literal>
@@ -2464,7 +2464,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_CATALOG</literal>
@@ -2475,7 +2475,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>CHARACTER_SET_SCHEMA</literal>
@@ -2556,7 +2556,7 @@
<entry/>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>TABLE_CATALOG</literal>
@@ -2588,7 +2588,7 @@
<entry/>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>IS_DEFERRABLE</literal>
@@ -2599,7 +2599,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>INITIALLY_DEFERRED</literal>
@@ -2895,7 +2895,7 @@
<emphasis role="bold">Remarks</emphasis>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>SPECIFIC_CATALOG</literal>
@@ -2906,7 +2906,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>SPECIFIC_SCHEMA</literal>
@@ -2955,7 +2955,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>MODULE_CATALOG</literal>
@@ -2966,7 +2966,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>MODULE_SCHEMA</literal>
@@ -2977,7 +2977,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>MODULE_NAME</literal>
@@ -2988,7 +2988,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>USER_DEFINED_TYPE_CATALOG</literal>
@@ -2999,7 +2999,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>USER_DEFINED_TYPE_SCHEMA</literal>
@@ -3010,7 +3010,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>USER_DEFINED_TYPE_NAME</literal>
@@ -3106,7 +3106,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>IS_NULL_CALL</literal>
@@ -3126,7 +3126,7 @@
<literal>NULL</literal>
</entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>SCHEMA_LEVEL_ROUTINE</literal>
@@ -3137,7 +3137,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>MAX_DYNAMIC_RESULT_SETS</literal>
@@ -3148,7 +3148,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_USER_DEFINED_CAST</literal>
@@ -3159,7 +3159,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_IMPLICITLY_INVOCABLE</literal>
@@ -3179,7 +3179,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>TO_SQL_SPECIFIC_CATALOG</literal>
@@ -3190,7 +3190,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>TO_SQL_SPECIFIC_SCHEMA</literal>
@@ -3201,7 +3201,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>TO_SQL_SPECIFIC_NAME</literal>
@@ -3212,7 +3212,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>AS_LOCATOR</literal>
@@ -3241,7 +3241,7 @@
</entry>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>NEW_SAVEPOINT_LEVEL</literal>
@@ -3252,7 +3252,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>IS_UDT_DEPENDENT</literal>
@@ -3263,7 +3263,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>RESULT_CAST_FROM_DTD_IDENTIFIER</literal>
@@ -3274,7 +3274,7 @@
</entry>
</row>
-->
- <!--
+<!--
<row>
<entry>
<literal>RESULT_CAST_AS_LOCATOR</literal>
@@ -3427,7 +3427,7 @@
<entry/>
<entry></entry>
</row>
- <!--
+<!--
<row>
<entry>
<literal>INSERTABLE_INTO</literal>
--- 1.10/refman/innodb.xml 2005-07-11 07:04:11 -05:00
+++ 1.11/refman/innodb.xml 2005-07-14 15:11:33 -05:00
@@ -105,7 +105,7 @@
<literal>InnoDB</literal> is published under the same GNU GPL License
Version 2 (of June 1991) as MySQL. For more information on MySQL
licensing, see
- <ulink url="http://www.mysql.com/company/legal/licensing/">http://www.mysql.com/company/legal/licensing/</ulink>.
+ <ulink url="http://www.mysql.com/company/legal/licensing/"/>.
</para>
</section>
@@ -120,7 +120,7 @@
</para>
<programlisting>
-Web site: <ulink url="http://www.innodb.com/">http://www.innodb.com/</ulink>
+Web site: <ulink url="http://www.innodb.com/"/>
Email: <email>sales@stripped</email>
Phone: +358-9-6969 3250 (office)
+358-40-5617367 (mobile)
@@ -165,8 +165,8 @@
<para>
To compile the MySQL source code with <literal>InnoDB</literal>
support, download MySQL 3.23.34a or newer from
- <ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink> and
- configure MySQL with the <literal>--with-innodb</literal> option. See
+ <ulink url="http://www.mysql.com/"/> and configure MySQL with the
+ <literal>--with-innodb</literal> option. See
<xref linkend="installing-source"/>.
</para>
@@ -923,20 +923,20 @@
0, then any <command>mysqld</command> process crash can erase the
last second of transactions. If you set the value to 2, then only an
operating system crash or a power outage can erase the last second
- of transactions. However, InnoDB's crash recovery is not affected
- and thus crash recovery does work regardless of the value.
- Note that many operating systems and some disk
- hardware fool in the flush-to-disk operation. They may tell to
- <command>mysqld</command> that the flush has taken place, though it
- has not. Then the durability of transactions is not guaranteed even
- with the setting 1, and in the worst case a power outage can even
- corrupt the InnoDB database. Using a battery-backed disk cache in
- the SCSI disk controller or in the disk itself speeds up file
- flushes, and makes the operation safer. You can also try using the
- Unix command <command>hdparm</command> to disable the caching of
- disk writes in hardware caches, or use some other command specific
- to the hardware vendor. The default value of this option is 1 (prior
- to MySQL 4.0.13, the default is 0).
+ of transactions. However, InnoDB's crash recovery is not affected
+ and thus crash recovery does work regardless of the value. Note that
+ many operating systems and some disk hardware fool in the
+ flush-to-disk operation. They may tell to <command>mysqld</command>
+ that the flush has taken place, though it has not. Then the
+ durability of transactions is not guaranteed even with the setting
+ 1, and in the worst case a power outage can even corrupt the InnoDB
+ database. Using a battery-backed disk cache in the SCSI disk
+ controller or in the disk itself speeds up file flushes, and makes
+ the operation safer. You can also try using the Unix command
+ <command>hdparm</command> to disable the caching of disk writes in
+ hardware caches, or use some other command specific to the hardware
+ vendor. The default value of this option is 1 (prior to MySQL
+ 4.0.13, the default is 0).
</para></listitem>
<listitem><para>
@@ -945,21 +945,21 @@
<para>
This option is relevant only on Unix systems. If set to
- <literal>fdatasync</literal> (the default), <literal>InnoDB</literal> uses
- <literal>fsync()</literal> to flush both the data and log files. If
- set to <literal>O_DSYNC</literal>, <literal>InnoDB</literal> uses
- <literal>O_SYNC</literal> to open and flush the log files, but uses
- <literal>fsync()</literal> to flush the data files. If
- <literal>O_DIRECT</literal> is specified (available on some
- GNU/Linux versions starting from MySQL 4.0.14),
+ <literal>fdatasync</literal> (the default),
+ <literal>InnoDB</literal> uses <literal>fsync()</literal> to flush
+ both the data and log files. If set to <literal>O_DSYNC</literal>,
+ <literal>InnoDB</literal> uses <literal>O_SYNC</literal> to open and
+ flush the log files, but uses <literal>fsync()</literal> to flush
+ the data files. If <literal>O_DIRECT</literal> is specified
+ (available on some GNU/Linux versions starting from MySQL 4.0.14),
<literal>InnoDB</literal> uses <literal>O_DIRECT</literal> to open
the data files, and uses <literal>fsync()</literal> to flush both
the data and log files. Note that starting from MySQL 3.23.41,
<literal>InnoDB</literal> uses <literal>fsync()</literal> instead of
<literal>fdatasync()</literal>, and it does not use
- <literal>O_DSYNC</literal> by
- default because there have been problems with them on many Unix
- flavors. This option is available as of MySQL 3.23.40.
+ <literal>O_DSYNC</literal> by default because there have been
+ problems with them on many Unix flavors. This option is available as
+ of MySQL 3.23.40.
</para></listitem>
<listitem><para>
@@ -1324,8 +1324,8 @@
number of processors and disks your system has. A value of 500 or
greater disables the concurrency checking. This option is available
starting from MySQL 3.23.44 and 4.0.1. Starting with MySQL 5.0.8,
- the default value is 20, and the concurrency checking will be disabled
- if the setting is greater than or equal to 20.
+ the default value is 20, and the concurrency checking will be
+ disabled if the setting is greater than or equal to 20.
</para>
<para>
@@ -1857,8 +1857,9 @@
</para></listitem>
<listitem><para>
- If the <literal>CONSTRAINT<replaceable>symbol</replaceable></literal>
- is given, it must be unique in the database. If it is not given,
+ If the
+ <literal>CONSTRAINT<replaceable>symbol</replaceable></literal> is
+ given, it must be unique in the database. If it is not given,
<literal>InnoDB</literal> creates the name automatically.
</para></listitem>
@@ -1888,11 +1889,10 @@
parent table and automatically delete or update the matching rows
in the child table. <literal>ON DELETE CASCADE</literal> is
available starting from MySQL 3.23.50 and <literal>ON UPDATE
- CASCADE</literal> is available starting from 4.0.8.
- Between two tables,
- you should not define several <literal>ON UPDATE CASCADE</literal>
- clauses that act on the same column in the parent table or in the
- child table.
+ CASCADE</literal> is available starting from 4.0.8. Between two
+ tables, you should not define several <literal>ON UPDATE
+ CASCADE</literal> clauses that act on the same column in the parent
+ table or in the child table.
</para></listitem>
<listitem><para>
@@ -1954,9 +1954,9 @@
<para>
<literal>InnoDB</literal> needs indexes on foreign keys and
referenced keys so that foreign key checks can be fast and not
- require a table scan. Starting with MySQL 4.1.2, the index on
- the foreign key is created automatically. In older versions, the
- indexes must be created explicitly or the creation of foreign key
+ require a table scan. Starting with MySQL 4.1.2, the index on the
+ foreign key is created automatically. In older versions, the indexes
+ must be created explicitly or the creation of foreign key
constraints fails.
</para>
@@ -2032,10 +2032,10 @@
are only checked after the WHOLE SQL statement has been processed.
</para>
- <para>
- <emphasis role="bold">Note</emphasis>: Currently, triggers are not
- activated by cascaded foreign key actions.
- </para>
+ <para>
+ <emphasis role="bold">Note</emphasis>: Currently, triggers are not
+ activated by cascaded foreign key actions.
+ </para>
<para>
A simple example that relates <literal>parent</literal> and
@@ -4041,14 +4041,13 @@
<literal>TRUNCATE</literal>, <literal>UNLOCK TABLES</literal>.
</para></listitem>
- <listitem>
- <para>Before MySQL 4.0.13, <literal>CREATE TABLE</literal> commits
- if binary logging is used. Starting with MySQL 4.1.13 and MySQL
- 5.0.8, the statements <literal>CREATE TABLE</literal>,
- <literal>TRUNCATE TABLE</literal>, <literal>DROP
- DATABASE</literal>, and <literal>CREATE DATABASE</literal> cause
- an implicit commit.</para>
- </listitem>
+ <listitem><para>
+ Before MySQL 4.0.13, <literal>CREATE TABLE</literal> commits if
+ binary logging is used. Starting with MySQL 4.1.13 and MySQL 5.0.8,
+ the statements <literal>CREATE TABLE</literal>, <literal>TRUNCATE
+ TABLE</literal>, <literal>DROP DATABASE</literal>, and
+ <literal>CREATE DATABASE</literal> cause an implicit commit.
+ </para></listitem>
<listitem><para>
The <literal>CREATE TABLE</literal> statement in
@@ -4286,10 +4285,10 @@
<para>
When using <literal>row_format=compact</literal> (the default InnoDB
- record format in MySQL 5.0) and variable-length character sets, such as
- <literal>utf8</literal> or <literal>sjis</literal>,
- <literal>CHAR(<replaceable>N</replaceable>)</literal> will occupy
- a variable amount of space, at least <replaceable>N</replaceable>
+ record format in MySQL 5.0) and variable-length character sets, such
+ as <literal>utf8</literal> or <literal>sjis</literal>,
+ <literal>CHAR(<replaceable>N</replaceable>)</literal> will occupy a
+ variable amount of space, at least <replaceable>N</replaceable>
bytes.
</para></listitem>
@@ -6140,16 +6139,16 @@
<listitem><para>
The maximum row length, except for <literal>VARCHAR</literal>,
- <literal>BLOB</literal> and
- <literal>TEXT</literal> columns, is slightly less than half of a
- database page. That is, the maximum row length is about 8000 bytes.
- <literal>LONGBLOB</literal> and <literal>LONGTEXT</literal> columns
- must be less than 4GB, and the total row length, including also
- <literal>BLOB</literal> and <literal>TEXT</literal> columns, must be
- less than 4GB. <literal>InnoDB</literal> stores the first 768 bytes
- of a <literal>VARCHAR</literal>,
- <literal>BLOB</literal>, or <literal>TEXT</literal> column in
- the row, and the rest into separate pages.
+ <literal>BLOB</literal> and <literal>TEXT</literal> columns, is
+ slightly less than half of a database page. That is, the maximum row
+ length is about 8000 bytes. <literal>LONGBLOB</literal> and
+ <literal>LONGTEXT</literal> columns must be less than 4GB, and the
+ total row length, including also <literal>BLOB</literal> and
+ <literal>TEXT</literal> columns, must be less than 4GB.
+ <literal>InnoDB</literal> stores the first 768 bytes of a
+ <literal>VARCHAR</literal>, <literal>BLOB</literal>, or
+ <literal>TEXT</literal> column in the row, and the rest into
+ separate pages.
</para></listitem>
<listitem><para>
@@ -6382,7 +6381,8 @@
</para></listitem>
<listitem><para>
- Currently, triggers are not activated by cascaded foreign key actions.
+ Currently, triggers are not activated by cascaded foreign key
+ actions.
</para></listitem>
</itemizedlist>
--- 1.1/refman/maxdb.xml 2005-06-15 18:46:58 -05:00
+++ 1.2/refman/maxdb.xml 2005-07-14 15:11:33 -05:00
@@ -66,7 +66,7 @@
products distributed by MySQL AB. Thus, MaxDB is available under the
GNU General Public License, and a commercial license. For more
information on licensing, see
- <ulink url="http://www.mysql.com/company/legal/licensing/">http://www.mysql.com/company/legal/licensing/</ulink>.
+ <ulink url="http://www.mysql.com/company/legal/licensing/"/>.
</para>
<para>
@@ -86,10 +86,9 @@
<para>
The main page for information about MaxDB is
- <ulink url="http://www.mysql.com/products/maxdb">http://www.mysql.com/products/maxdb</ulink>.
- Information formerly available at
- <ulink url="http://www.sapdb.org">http://www.sapdb.org</ulink> has
- been moved there.
+ <ulink url="http://www.mysql.com/products/maxdb"/>. Information
+ formerly available at <ulink url="http://www.sapdb.org"/> has been
+ moved there.
</para>
</section>
--- 1.6/refman/mysql-apis.xml 2005-07-11 13:19:44 -05:00
+++ 1.7/refman/mysql-apis.xml 2005-07-14 15:11:33 -05:00
@@ -12193,11 +12193,11 @@
<para>
In the older binaries we distribute on our Web site
- (<ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink>),
- the client libraries are not normally compiled with the thread-safe
- option (the Windows binaries are by default compiled to be
- thread-safe). Newer binary distributions should have both a normal
- and a thread-safe client library.
+ (<ulink url="http://www.mysql.com/"/>), the client libraries are not
+ normally compiled with the thread-safe option (the Windows binaries
+ are by default compiled to be thread-safe). Newer binary
+ distributions should have both a normal and a thread-safe client
+ library.
</para>
<para>
@@ -12881,7 +12881,7 @@
under the GPL or a compatible license. For those who are not able
to do this, another option is to purchase a commercial license for
the MySQL code from MySQL AB. For details, please see
- <ulink url="http://www.mysql.com/company/legal/licensing/">http://www.mysql.com/company/legal/licensing/</ulink>.
+ <ulink url="http://www.mysql.com/company/legal/licensing/"/>.
</para>
</section>
@@ -12922,8 +12922,7 @@
you will likely want to configure the MySQL server to use the
<command>--old-passwords</command> option (see
<xref linkend="old-client"/>). This extension is documented on the
- PHP Website at
- <ulink url="http://php.net/mysql">http://php.net/mysql</ulink>.
+ PHP Website at <ulink url="http://php.net/mysql"/>.
</para></listitem>
<listitem><para>
@@ -12935,10 +12934,9 @@
APIs. In addition, this extension provides an advanced,
object-oriented programming interface. You can read the
documentation for the <emphasis role="bold">mysqli</emphasis>
- extension at
- <ulink url="http://php.net/mysqli">http://php.net/mysqli</ulink>. A
- helpful article can be found at
- <ulink url="http://www.zend.com/php5/articles/php5-mysqli.php">http://www.zend.com/php5/articles/php5-mysqli.php</ulink>.
+ extension at <ulink url="http://php.net/mysqli"/>. A helpful article
+ can be found at
+ <ulink url="http://www.zend.com/php5/articles/php5-mysqli.php"/>.
</para></listitem>
</itemizedlist>
@@ -13063,10 +13061,9 @@
<listitem><para>
For online information about Perl DBI, visit the DBI Web site,
- <ulink url="http://dbi.perl.org/">http://dbi.perl.org/</ulink>. That
- site hosts a general DBI mailing list. MySQL AB hosts a list
- specifically about <literal>DBD::mysql</literal>; see
- <xref linkend="mailing-list"/>.
+ <ulink url="http://dbi.perl.org/"/>. That site hosts a general DBI
+ mailing list. MySQL AB hosts a list specifically about
+ <literal>DBD::mysql</literal>; see <xref linkend="mailing-list"/>.
</para></listitem>
<listitem><para>
@@ -13074,14 +13071,14 @@
<citetitle>Programming the Perl DBI</citetitle> (Alligator Descartes
and Tim Bunce, O'Reilly & Associates, 2000). Information about
the book is available at the DBI Web site,
- <ulink url="http://dbi.perl.org/">http://dbi.perl.org/</ulink>.
+ <ulink url="http://dbi.perl.org/"/>.
</para>
<para>
For information that focuses specifically on using DBI with MySQL,
see <citetitle>MySQL and Perl for the Web</citetitle> (Paul DuBois,
New Riders, 2001). This book's Web site is
- <ulink url="http://www.kitebird.com/mysql-perl/">http://www.kitebird.com/mysql-perl/</ulink>.
+ <ulink url="http://www.kitebird.com/mysql-perl/"/>.
</para></listitem>
</itemizedlist>
@@ -13103,7 +13100,7 @@
<para>
<literal>MySQL++</literal> is a MySQL API for C++. Warren Young has
taken over this project. More information can be found at
- <ulink url="http://www.mysql.com/products/mysql++/">http://www.mysql.com/products/mysql++/</ulink>.
+ <ulink url="http://www.mysql.com/products/mysql++/"/>.
</para>
<section id="borland-c-plus-plus">
@@ -13145,7 +13142,7 @@
<para>
<literal>MySQLdb</literal> provides MySQL support for Python,
compliant with the Python DB API version 2.0. It can be found at
- <ulink url="http://sourceforge.net/projects/mysql-python/">http://sourceforge.net/projects/mysql-python/</ulink>.
+ <ulink url="http://sourceforge.net/projects/mysql-python/"/>.
</para>
</section>
@@ -13161,7 +13158,7 @@
<para>
<literal>MySQLtcl</literal> is a simple API for accessing a MySQL
database server from the Tcl programming language. It can be found at
- <ulink url="http://www.xdobry.de/mysqltcl/">http://www.xdobry.de/mysqltcl/</ulink>.
+ <ulink url="http://www.xdobry.de/mysqltcl/"/>.
</para>
</section>
@@ -13183,7 +13180,7 @@
Eiffel MySQL is an interface to the MySQL database server using the
Eiffel programming language, written by Michael Ravits. It can be
found at
- <ulink url="http://efsa.sourceforge.net/archive/ravits/mysql.htm">http://efsa.sourceforge.net/archive/ravits/mysql.htm</ulink>.
+ <ulink url="http://efsa.sourceforge.net/archive/ravits/mysql.htm"/>.
</para>
</section>
--- 1.26/refman/mysql-database-administration.xml 2005-07-13 09:39:17 -05:00
+++ 1.27/refman/mysql-database-administration.xml 2005-07-14 15:11:33 -05:00
@@ -217,8 +217,8 @@
<para>
The MySQL bug reporting script. It can be used to send a bug report
to the MySQL mailing list. (You can also visit
- <ulink url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>
- to file a bug report online. See <xref linkend="bug-reports"/>.)
+ <ulink url="http://bugs.mysql.com/"/> to file a bug report online.
+ See <xref linkend="bug-reports"/>.)
</para></listitem>
</itemizedlist>
@@ -253,8 +253,8 @@
server (<literal>mysqld.exe</literal>) and the MySQL-Max server
(<command>mysqld-max.exe</command>), so you need not get a special
distribution. Just use a regular Windows distribution, available at
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>.
- See <xref linkend="windows-installation"/>.
+ <ulink url="http://dev.mysql.com/downloads/"/>. See
+ <xref linkend="windows-installation"/>.
</para></listitem>
<listitem><para>
@@ -278,7 +278,7 @@
<para>
You can find the MySQL-Max binaries on the MySQL AB Web site at
- <ulink url="http://dev.mysql.com/downloads/mysql-4.0.html">http://dev.mysql.com/downloads/mysql-4.0.html</ulink>.
+ <ulink url="http://dev.mysql.com/downloads/mysql-4.0.html"/>.
</para>
<para>
@@ -10769,9 +10769,8 @@
connection even more secure, you should use SSH to get an encrypted
TCP/IP connection between a MySQL server and a MySQL client. You can
find an Open Source SSH client at
- <ulink url="http://www.openssh.org/">http://www.openssh.org/</ulink>,
- and a commercial SSH client at
- <ulink url="http://www.ssh.com/">http://www.ssh.com/</ulink>.
+ <ulink url="http://www.openssh.org/"/>, and a commercial SSH client
+ at <ulink url="http://www.ssh.com/"/>.
</para>
<para>
@@ -16548,7 +16547,7 @@
<listitem><para>
Install the OpenSSL library. We have tested MySQL with OpenSSL
0.9.6. If you need OpenSSL, visit
- <ulink url="http://www.openssl.org">http://www.openssl.org</ulink>.
+ <ulink url="http://www.openssl.org"/>.
</para></listitem>
<listitem><para>
@@ -17116,11 +17115,11 @@
<para>
Install an SSH client on your Windows machine. As a user, the best
non-free one I've found is from <literal>SecureCRT</literal> from
- <ulink url="http://www.vandyke.com/">http://www.vandyke.com/</ulink>.
- Another option is <literal>f-secure</literal> from
- <ulink url="http://www.f-secure.com/">http://www.f-secure.com/</ulink>.
- You can also find some free ones on <literal>Google</literal> at
- <ulink url="http://directory.google.com/Top/Computers/Security/Products_and_Tools/Cryptography/SSH/Clients/Windows/">http://directory.google.com/Top/Computers/Security/Products_and_Tools/Cryptography/SSH/Clients/Windows/</ulink>.
+ <ulink url="http://www.vandyke.com/"/>. Another option is
+ <literal>f-secure</literal> from
+ <ulink url="http://www.f-secure.com/"/>. You can also find some
+ free ones on <literal>Google</literal> at
+ <ulink url="http://directory.google.com/Top/Computers/Security/Products_and_Tools/Cryptography/SSH/Clients/Windows/"/>.
</para></listitem>
<listitem><para>
@@ -21104,8 +21103,8 @@
If your system doesn't have a zoneinfo database (for example,
Windows or HP-UX), you can use the package of pre-built time zone
tables that is available for download at
- <ulink url="http://dev.mysql.com/downloads/timezones.html">http://dev.mysql.com/downloads/timezones.html</ulink>.
- This package contains <filename>.frm</filename>,
+ <ulink url="http://dev.mysql.com/downloads/timezones.html"/>. This
+ package contains <filename>.frm</filename>,
<filename>.MYD</filename>, and <filename>.MYI</filename> files for
the <literal>MyISAM</literal> time zone tables. These tables should
belong to the <literal>mysql</literal> database, so you should place
@@ -23330,10 +23329,11 @@
<para>
When setting <literal>query_cache_size</literal> to a non-zero value
keep in mind that the query cache needs a minimum size of about 40KB
- to allocate its structures. (The exact size depends on
+ to allocate its structures. (The exact size depends on
architecture.) If you set the value too small, you'll get a warning,
like in this example:
- <programlisting>
+
+<programlisting>
mysql> <userinput>SET GLOBAL query_cache_size = 40000;</userinput>
Query OK, 0 rows affected, 1 warning (0.00 sec)
--- 1.1/refman/mysql-floss-license-exception.xml 2005-06-15 18:46:58 -05:00
+++ 1.2/refman/mysql-floss-license-exception.xml 2005-07-14 15:11:33 -05:00
@@ -300,10 +300,10 @@
Due to the many variants of some of the above licenses, we require
that any version follow the 2003 version of the Free Software
Foundation's Free Software Definition
- (<ulink url="http://www.gnu.org/philosophy/free-sw.html">http://www.gnu.org/philosophy/free-sw.html</ulink>)
- or version 1.9 of the Open Source Definition by the Open Source
+ (<ulink url="http://www.gnu.org/philosophy/free-sw.html"/>) or
+ version 1.9 of the Open Source Definition by the Open Source
Initiative
- (<ulink url="http://www.opensource.org/docs/definition.php">http://www.opensource.org/docs/definition.php</ulink>).
+ (<ulink url="http://www.opensource.org/docs/definition.php"/>).
</para></listitem>
<listitem><para>
--- 1.1/refman/mysql-optimization.xml 2005-06-15 18:46:58 -05:00
+++ 1.2/refman/mysql-optimization.xml 2005-07-14 15:11:33 -05:00
@@ -212,10 +212,9 @@
<para>
For <literal>crash-me</literal> results, visit
- <ulink url="http://dev.mysql.com/tech-resources/crash-me.php">http://dev.mysql.com/tech-resources/crash-me.php</ulink>.
- See
- <ulink url="http://dev.mysql.com/tech-resources/benchmarks/">http://dev.mysql.com/tech-resources/benchmarks/</ulink>
- for the results from the benchmarks.
+ <ulink url="http://dev.mysql.com/tech-resources/crash-me.php"/>. See
+ <ulink url="http://dev.mysql.com/tech-resources/benchmarks/"/> for
+ the results from the benchmarks.
</para>
<para>
@@ -402,8 +401,8 @@
<listitem><para>
The benchmark suite is provided with MySQL source distributions.
You can either download a released distribution from
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>,
- or use the current development source tree (see
+ <ulink url="http://dev.mysql.com/downloads/"/>, or use the current
+ development source tree (see
<xref linkend="installing-source-tree"/>).
</para></listitem>
@@ -481,9 +480,9 @@
<para>
You can find the results from <literal>crash-me</literal> for many
different database servers at
- <ulink url="http://dev.mysql.com/tech-resources/crash-me.php">http://dev.mysql.com/tech-resources/crash-me.php</ulink>.
- For more information about benchmark results, visit
- <ulink url="http://dev.mysql.com/tech-resources/benchmarks/">http://dev.mysql.com/tech-resources/benchmarks/</ulink>.
+ <ulink url="http://dev.mysql.com/tech-resources/crash-me.php"/>. For
+ more information about benchmark results, visit
+ <ulink url="http://dev.mysql.com/tech-resources/benchmarks/"/>.
</para>
</section>
@@ -521,8 +520,7 @@
<para>
Another free benchmark suite is the Open Source Database Benchmark,
- available at
- <ulink url="http://osdb.sourceforge.net/">http://osdb.sourceforge.net/</ulink>.
+ available at <ulink url="http://osdb.sourceforge.net/"/>.
</para>
<para>
@@ -541,9 +539,9 @@
To avoid problems like this, you should put some effort into
benchmarking your whole application under the worst possible load!
You can use Super Smack for this. It is available at
- <ulink url="http://jeremy.zawodny.com/mysql/super-smack/">http://jeremy.zawodny.com/mysql/super-smack/</ulink>.
- As the name suggests, it can bring a system to its knees if you ask
- it, so make sure to use it only on your development systems.
+ <ulink url="http://jeremy.zawodny.com/mysql/super-smack/"/>. As the
+ name suggests, it can bring a system to its knees if you ask it, so
+ make sure to use it only on your development systems.
</para>
</section>
--- 1.6/refman/ndbcluster.xml 2005-06-28 00:19:26 -05:00
+++ 1.7/refman/ndbcluster.xml 2005-07-14 15:11:33 -05:00
@@ -52,8 +52,7 @@
This chapter represents a work in progress, and its contents are
subject to revision as MySQL Cluster continues to evolve. Additional
information regarding MySQL Cluster can be found on the MySQL AB Web
- site at
- <ulink url="http://www.mysql.com/products/cluster/">http://www.mysql.com/products/cluster/</ulink>.
+ site at <ulink url="http://www.mysql.com/products/cluster/"/>.
</para>
<para>
@@ -64,8 +63,8 @@
<itemizedlist>
<listitem><para>
- the MySQL Cluster
- <ulink url="mailing list">http://lists.mysql.com/cluster</ulink>.
+ the MySQL Cluster <ulink url="http://lists.mysql.com/cluster">mailing
+ list</ulink>.
</para></listitem>
<listitem><para>
@@ -309,11 +308,11 @@
<title id='title-multi-computer'>&title-multi-computer;</title>
<para>
- This section is a "How-To" in which we describe the basics for
- how to plan, install, configure, and run a viable MySQL Cluster.
- Unlike the example in <xref linkend="mysql-cluster-configuration"/>,
- the result of following the guidelines and procedures outlined below
- should be a usable MySQL Cluster which meets minimum requirements for
+ This section is a "How-To" in which we describe the basics for how to
+ plan, install, configure, and run a viable MySQL Cluster. Unlike the
+ example in <xref linkend="mysql-cluster-configuration"/>, the result
+ of following the guidelines and procedures outlined below should be a
+ usable MySQL Cluster which meets minimum requirements for
availability and safeguarding of data.
</para>
@@ -494,8 +493,7 @@
merely to be able to use Cluster. In this How-To, we will assume
that you are using the <literal>-max</literal> binary appropriate to
your operating system, available via the MySQL software downloads
- page at
- <ulink url="http://dev.mysql.com/downloads">http://dev.mysql.com/downloads</ulink>.
+ page at <ulink url="http://dev.mysql.com/downloads"/>.
</para>
<para>
@@ -874,9 +872,8 @@
<para>
(<emphasis role="bold">NOTE</emphasis>: The "world" database can be
- downloaded from
- <ulink url="http://dev.mysql.com/doc/">http://dev.mysql.com/doc/</ulink>
- where it can be found listed under "Examples".)
+ downloaded from <ulink url="http://dev.mysql.com/doc/"/> where it
+ can be found listed under "Examples".)
</para>
<para>
@@ -1980,8 +1977,8 @@
Prior to MySQL 4.1.8, the default port was 2200.) This port should
always be available on the network, since it has been assigned by
IANA for this purpose (see
- <ulink url="http://www.iana.org/assignments/port-numbers">http://www.iana.org/assignments/port-numbers</ulink>
- for details).
+ <ulink url="http://www.iana.org/assignments/port-numbers"/> for
+ details).
</para>
<para>
@@ -7846,9 +7843,8 @@
there are no plans to address these in coming releases of 4.1;
however, we will attempt to supply fixes for these issues in MySQL
5.0 and subsequent releases. If you check the Cluster category in the
- MySQL bugs database at
- <ulink url="http://bugs.mysql.com">http://bugs.mysql.com</ulink>, you
- can find known bugs which (if marked 4.1) we intend to correct in
+ MySQL bugs database at <ulink url="http://bugs.mysql.com"/>, you can
+ find known bugs which (if marked 4.1) we intend to correct in
upcoming releases of MySQL 4.1.
</para>
--- 1.1/refman/porting.xml 2005-06-15 18:46:58 -05:00
+++ 1.2/refman/porting.xml 2005-07-14 15:11:33 -05:00
@@ -21,8 +21,8 @@
check the list of currently supported operating systems first. See
<xref linkend="which-os"/>. If you have created a new port of MySQL,
please let us know so that we can list it here and on our Web site
- (<ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink>),
- recommending it to other users.
+ (<ulink url="http://www.mysql.com/"/>), recommending it to other
+ users.
</para>
<para>
@@ -42,25 +42,24 @@
The hard part of porting to a new Unix variant without good native
thread support is probably to port MIT-pthreads. See
<filename>mit-pthreads/README</filename> and Programming POSIX Threads
- (<ulink url="http://www.humanfactor.com/pthreads/">http://www.humanfactor.com/pthreads/</ulink>).
+ (<ulink url="http://www.humanfactor.com/pthreads/"/>).
</para>
<para>
Up to MySQL 4.0.2, the MySQL distribution included a patched version
of Chris Provenzano's Pthreads from MIT (see the MIT Pthreads Web page
- at
- <ulink url="http://www.mit.edu/afs/sipb/project/pthreads/">http://www.mit.edu/afs/sipb/project/pthreads/</ulink>
- and a programming introduction at
- <ulink url="http://www.mit.edu:8001/people/proven/IAP_2000/">http://www.mit.edu:8001/people/proven/IAP_2000/</ulink>).
- These can be used for some operating systems that do not have POSIX
- threads. See <xref linkend="mit-pthreads"/>.
+ at <ulink url="http://www.mit.edu/afs/sipb/project/pthreads/"/> and a
+ programming introduction at
+ <ulink url="http://www.mit.edu:8001/people/proven/IAP_2000/"/>). These
+ can be used for some operating systems that do not have POSIX threads.
+ See <xref linkend="mit-pthreads"/>.
</para>
<para>
It is also possible to use another user level thread package named FSU
Pthreads (see
- <ulink url="http://moss.csc.ncsu.edu/~mueller/pthreads/">http://moss.csc.ncsu.edu/~mueller/pthreads/</ulink>).
- This implementation is being used for the SCO port.
+ <ulink url="http://moss.csc.ncsu.edu/~mueller/pthreads/"/>). This
+ implementation is being used for the SCO port.
</para>
<para>
@@ -341,8 +340,8 @@
the trace file to the appropriate mailing list where something seems
to go wrong! If you can't locate the wrong place, you can ftp the
trace file, together with a full bug report, to
- <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
- so that a MySQL developer can take a look a this.
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> so that a MySQL
+ developer can take a look a this.
</para>
<para>
@@ -681,8 +680,8 @@
If this doesn't help and you can't find anything in the
<literal>mysql</literal> mail archive, you should report the bug to
a MySQL mailing list. The mailing lists are described at
- <ulink url="http://lists.mysql.com/">http://lists.mysql.com/</ulink>,
- which also has links to online list archives.
+ <ulink url="http://lists.mysql.com/"/>, which also has links to
+ online list archives.
</para>
<para>
@@ -781,14 +780,11 @@
<command>mysqld</command> to die with the above command, you 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/">ftp://ftp.mysql.com/pub/mysql/upload/</ulink>
- and enter it into our bugs system at
- <ulink url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>.
- If you are a support customer, you can use the MySQL Customer
- Support Center
- <ulink url="https://support.mysql.com/">https://support.mysql.com/</ulink>
- to alert the MySQL team about the problem and have it fixed as soon
- as possible.
+ <ulink url="ftp://ftp.mysql.com/pub/mysql/upload/"/> and enter it
+ into our bugs system at <ulink url="http://bugs.mysql.com/"/>. If
+ you are a support customer, you can use the MySQL Customer Support
+ Center <ulink url="https://support.mysql.com/"/> to alert the MySQL
+ team about the problem and have it fixed as soon as possible.
</para></listitem>
</itemizedlist>
--- 1.4/refman/problems.xml 2005-07-09 10:37:18 -05:00
+++ 1.5/refman/problems.xml 2005-07-14 15:11:33 -05:00
@@ -537,7 +537,7 @@
configuration of MySQL need be done in order to use this newer MySQL
client library for PHP. For more information about the
<literal>mysqli</literal> extension, see
- <ulink url="http://php.net/mysqli">http://php.net/mysqli</ulink>.
+ <ulink url="http://php.net/mysqli"/>.
</para>
<para>
@@ -4248,8 +4248,8 @@
</para></listitem>
<listitem><para>
- When inserting a big integer value (between 2^63 and 2^64−1) into a
- decimal or string column, it is inserted as a negative value
+ When inserting a big integer value (between 2^63 and 2^64−1) into
+ a decimal or string column, it is inserted as a negative value
because the number is evaluated in a signed integer context.
</para></listitem>
--- 1.2/refman/spatial-extensions-in-mysql.xml 2005-07-13 20:02:53 -05:00
+++ 1.3/refman/spatial-extensions-in-mysql.xml 2005-07-14 15:11:33 -05:00
@@ -74,18 +74,17 @@
universities participating in the development of publicly available
conceptual solutions that can be useful with all kinds of
applications that manage spatial data. The OGC maintains a Web site
- at
- <ulink url="http://www.opengis.org/">http://www.opengis.org/</ulink>.
+ at <ulink url="http://www.opengis.org/"/>.
</para>
<para>
- In 1997, the Open GIS Consortium published the <citetitle>OpenGIS®
- Simple Features Specifications For SQL</citetitle>, a document that
- proposes several conceptual ways for extending an SQL RDBMS to
- support spatial data. This specification is available from the Open
- GIS Web site at
- <ulink url="http://www.opengis.org/docs/99-049.pdf">http://www.opengis.org/docs/99-049.pdf</ulink>.
- It contains additional information relevant to this chapter.
+ In 1997, the Open GIS Consortium published the
+ <citetitle>OpenGIS® Simple Features Specifications For
+ SQL</citetitle>, a document that proposes several conceptual ways for
+ extending an SQL RDBMS to support spatial data. This specification is
+ available from the Open GIS Web site at
+ <ulink url="http://www.opengis.org/docs/99-049.pdf"/>. It contains
+ additional information relevant to this chapter.
</para>
<para>
--- 1.3/refman/storage-engines.xml 2005-07-08 10:47:07 -05:00
+++ 1.4/refman/storage-engines.xml 2005-07-14 15:11:33 -05:00
@@ -1847,8 +1847,8 @@
<literal>MEMORY</literal> tables allow up to 32 indexes per table
and 16 columns per index. Previously, the maximum key length
supported by this storage engine was 255 bytes; as of MySQL 4.1.13
- and MySQL 5.0.8, <literal>MEMORY</literal> tables support a
- maximum key length of 500 bytes. (See <xref linkend="news-4-1-3"/>,
+ and MySQL 5.0.8, <literal>MEMORY</literal> tables support a maximum
+ key length of 500 bytes. (See <xref linkend="news-4-1-3"/>,
<xref linkend="news-5-0-8"/>.)
</para></listitem>
@@ -2080,8 +2080,7 @@
<para>
For general information about Berkeley DB, please visit the Sleepycat
- Web site,
- <ulink url="http://www.sleepycat.com/">http://www.sleepycat.com/</ulink>.
+ Web site, <ulink url="http://www.sleepycat.com/"/>.
</para>
<section id="bdb-portability">
--- 1.5/refman/tutorial.xml 2005-07-12 13:37:24 -05:00
+++ 1.6/refman/tutorial.xml 2005-07-14 15:11:33 -05:00
@@ -620,9 +620,9 @@
some of the queries and sample data used in the following sections
can be obtained from the MySQL Web site. It's available in either
compressed <command>tar</command> format
- (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.tar.gz">http://www.mysql.com/Downloads/Contrib/Examples/menagerie.tar.gz</ulink>)
+ (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.tar.gz"/>)
or Zip format
- (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.zip">http://www.mysql.com/Downloads/Contrib/Examples/menagerie.zip</ulink>).
+ (<ulink url="http://www.mysql.com/Downloads/Contrib/Examples/menagerie.zip"/>).
</para>
<para>
@@ -3948,7 +3948,7 @@
<para>
More information about Twin studies can be found at:
- <ulink url="http://www.mep.ki.se/twinreg/index_en.html">http://www.mep.ki.se/twinreg/index_en.html</ulink>
+ <ulink url="http://www.mep.ki.se/twinreg/index_en.html"/>
</para>
<para>
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3026) | paul | 14 Jul |
