Author: mcbrown
Date: 2007-10-14 20:04:12 +0200 (Sun, 14 Oct 2007)
New Revision: 8087
Log:
Fixing the outstanding admonititions, a reformat and updates to some dependencies
Modified:
trunk/administrator/administrator.xml
trunk/administrator/chapter-options-administrator.xml
trunk/administrator/connection-dialog.xml
trunk/administrator/service-control.xml
trunk/administrator/tray-monitor.xml
trunk/administrator/user-administration.xml
trunk/arbitrary/all-man.xml
trunk/arbitrary/connectors.xml
trunk/arbitrary/windows.xml
trunk/gui-common/chapter-options-introduction.xml
trunk/gui-common/chapter-upgrade-all.xml
trunk/gui-common/installation-all.xml
trunk/gui-common/mysql-enterprise.xml
trunk/mysqlqb/Makefile
trunk/mysqltest/command-reference.xml
trunk/mysqltest/tutorial.xml
trunk/ndbapi/class-member-template.xml
trunk/ndbapi/ndb-internals.xml
trunk/ndbapi/ndbrecord-tmp.xml
trunk/query-browser/connection-dialog.xml
trunk/quick-guides/mysqld-vs-optvar-core.xml
trunk/quick-guides/mysqld-vs.xml
trunk/refman-4.1/Makefile.depends
trunk/refman-4.1/apis-c.xml
trunk/refman-4.1/charset.xml
trunk/refman-4.1/client-utility-programs.xml
trunk/refman-4.1/data-types.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-4.1/errors-problems.xml
trunk/refman-4.1/extending-mysql.xml
trunk/refman-4.1/functions-core.xml
trunk/refman-4.1/introduction.xml
trunk/refman-4.1/language-structure.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-4.1/storage-engines.xml
trunk/refman-4.1/tutorial.xml
trunk/refman-5.0/Makefile.depends
trunk/refman-5.0/apis-c.xml
trunk/refman-5.0/charset.xml
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.0/data-types.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.0/errors-problems.xml
trunk/refman-5.0/faqs.xml
trunk/refman-5.0/functions-core.xml
trunk/refman-5.0/introduction.xml
trunk/refman-5.0/language-structure.xml
trunk/refman-5.0/replication-notes.xml
trunk/refman-5.0/se-myisam.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.0/tutorial.xml
trunk/refman-5.1/Makefile.depends
trunk/refman-5.1/apis-c.xml
trunk/refman-5.1/charset.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/data-types.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-5.1/errors-problems.xml
trunk/refman-5.1/extending-mysql.xml
trunk/refman-5.1/faqs.xml
trunk/refman-5.1/functions-core.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/introduction.xml
trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
trunk/refman-5.1/partitioning-guide.xml
trunk/refman-5.1/se-myisam.xml
trunk/refman-5.1/tutorial.xml
trunk/refman-5.2/Makefile.depends
trunk/refman-5.2/client-utility-programs.xml
trunk/refman-5.2/data-types.xml
trunk/refman-5.2/dba-core.xml
trunk/refman-5.2/errors-problems.xml
trunk/refman-5.2/extending-mysql.xml
trunk/refman-5.2/faqs.xml
trunk/refman-5.2/functions-core.xml
trunk/refman-5.2/introduction.xml
trunk/refman-5.2/partitioning-guide.xml
trunk/refman-5.2/se-myisam.xml
trunk/refman-5.2/tutorial.xml
trunk/userguide/about.xml
trunk/userguide/basic-administration.xml
trunk/userguide/excel-mysql.xml
trunk/userguide/indexing.xml
trunk/userguide/installing.xml
trunk/userguide/introduction.xml
trunk/userguide/log-files.xml
trunk/userguide/modifying.xml
trunk/userguide/mysql-client-programs.xml
trunk/userguide/mysql-server-programs.xml
trunk/userguide/php-pdo.xml
trunk/userguide/populating.xml
trunk/userguide/querying.xml
trunk/userguide/storage-engines.xml
trunk/userguide/userguide.xml
trunk/userguide/views.xml
Modified: trunk/administrator/administrator.xml
===================================================================
--- trunk/administrator/administrator.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/administrator/administrator.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 3, Lines Added: 2, Lines Deleted: 3; 1160 bytes
@@ -65,7 +65,7 @@
<xi:include href="server-connections.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="user-administration.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
+
<xi:include href="health.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="server-logs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -90,7 +90,7 @@
-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../gui-common/chapter-options-introduction.xml"/>
-
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter-options-administrator.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../gui-common/chapter-options-general.xml"/>
@@ -99,7 +99,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../gui-common/chapter-options-editors.xml"/>
-
</chapter>
<!-- END OPTIONS CHAPTER -->
Modified: trunk/administrator/chapter-options-administrator.xml
===================================================================
--- trunk/administrator/chapter-options-administrator.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/administrator/chapter-options-administrator.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 406 bytes
@@ -139,8 +139,7 @@
</itemizedlist>
</section>
-
-
+
<!-- END BACKUP -->
</section>
Modified: trunk/administrator/connection-dialog.xml
===================================================================
--- trunk/administrator/connection-dialog.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/administrator/connection-dialog.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 6; 1320 bytes
@@ -211,10 +211,12 @@
<xref linkend="multiple-servers"/>.
</para>
- <para>
- <emphasis role="bold">Note</emphasis>: The preceding applies
- only to &administrator; when running on Windows.
- </para>
+ <note>
+ <para>
+ The preceding applies only to &administrator; when running
+ on Windows.
+ </para>
+ </note>
</listitem>
</itemizedlist>
@@ -264,10 +266,15 @@
can select the service that you wish to configure, or the server
that you want to stop or start. Only servers that have been
installed using the Windows installer will appear here.
- <emphasis role="bold">Note</emphasis>: <guilabel>Installed
- Services</guilabel> is only displayed under Windows.
</para>
+ <note>
+ <para>
+ <guilabel>Installed Services</guilabel> is only displayed under
+ Windows.
+ </para>
+ </note>
+
<para>
In configure-service mode, only the following sidebar options are
available:
Modified: trunk/administrator/service-control.xml
===================================================================
--- trunk/administrator/service-control.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/administrator/service-control.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 5; 1145 bytes
@@ -16,13 +16,18 @@
<para>
This section shows how to start and stop the MySQL server you are
connected to. Currently, this is only possible if the server is
- running on the same machine that hosts &administrator;.<remark>
- [PL] and if that service has been configured.
+ running on the same machine that hosts &administrator;.
+
+ <remark>
+ [PL] and if that service has been configured.
</remark>
+
You cannot start and stop MySQL servers on remote machines.
- <remark>[PL]If the server runs as a stand-alone application,
- the Service Control
- section will not be enabled. (what do these remarks mean?
+
+ <remark>
+ [PL]If the server runs as a stand-alone application, the Service
+ Control section will not be enabled. (what do these remarks
+ mean?
</remark>
</para>
Modified: trunk/administrator/tray-monitor.xml
===================================================================
--- trunk/administrator/tray-monitor.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/administrator/tray-monitor.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 555 bytes
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
<!ENTITY % all.entities SYSTEM "all-entities.ent">
Modified: trunk/administrator/user-administration.xml
===================================================================
--- trunk/administrator/user-administration.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/administrator/user-administration.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 30, Lines Deleted: 32; 2466 bytes
@@ -545,61 +545,59 @@
</para>
</section> Resources
-->
+
<section id="administrator-resources">
-
+
<title>Resources</title>
-
+
<para>
- This tab allows you to limit a user's resources.
- You may set limits for the following items:
+ This tab allows you to limit a user's resources. You may set
+ limits for the following items:
</para>
-
-
+
<itemizedlist>
-
+
<listitem>
<para>
- <guilabel>max_questions</guilabel> –
- The number of questions allowed
- per hour
+ <guilabel>max_questions</guilabel> – The number of
+ questions allowed per hour
</para>
</listitem>
-
+
<listitem>
<para>
- <guilabel>max_update</guilabel> –
- The number of updates allowed per hour
+ <guilabel>max_update</guilabel> – The number of updates
+ allowed per hour
</para>
</listitem>
-
+
<listitem>
<para>
- <guilabel>max_connections</guilabel> –
- The number of connections allowed per hour
+ <guilabel>max_connections</guilabel> – The number of
+ connections allowed per hour
</para>
</listitem>
-
+
<listitem>
<para>
- <guilabel>max_user_connections</guilabel> –
- The number of simultaneous
- connections allowed
+ <guilabel>max_user_connections</guilabel> – The number
+ of simultaneous connections allowed
</para>
-
- <para>
- <emphasis role="bold">Note</emphasis>: This option
- is only available under Windows
- </para>
+
+ <note>
+ <para>
+ This option is only available under Windows
+ </para>
+ </note>
</listitem>
-
+
</itemizedlist>
-
+
<para>
- The default value for each of these settings is <literal>0</literal>,
- indicating no restrictions whatsoever.
+ The default value for each of these settings is
+ <literal>0</literal>, indicating no restrictions whatsoever.
</para>
-
+
</section>
-
-
+
</chapter>
Modified: trunk/arbitrary/all-man.xml
===================================================================
--- trunk/arbitrary/all-man.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/arbitrary/all-man.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 8; 1364 bytes
@@ -20,8 +20,11 @@
<abstract>
<para>
- This is the MySQL Manual. It documents MySQL
- ¤t-series; through ¤t-version;. This manual also contains details on MySQL GUI Tools (MySQL Administrator, MySQL Query Browser, MySQL Migration Toolkit and MySQL Workbench), and the MySQL Network Monitoring and Advisory Service (MNMAS).
+ This is the MySQL Manual. It documents MySQL ¤t-series;
+ through ¤t-version;. This manual also contains details on
+ MySQL GUI Tools (MySQL Administrator, MySQL Query Browser, MySQL
+ Migration Toolkit and MySQL Workbench), and the MySQL Network
+ Monitoring and Advisory Service (MNMAS).
</para>
<para>
@@ -38,19 +41,21 @@
</bookinfo>
-<part id="refman">
-<title>MySQL Reference Manual (¤t-series;)</title>
+ <part id="refman">
+ <title>MySQL Reference Manual (¤t-series;)</title>
+
<!--SRCFILE refman-->
-</part>
+ </part>
-<part id="gui-tools">
-<title>MySQL GUI Tools</title>
+ <part id="gui-tools">
+ <title>MySQL GUI Tools</title>
+
<!--SRCFILE gui-tools-->
-</part>
+ </part>
<index/>
Modified: trunk/arbitrary/connectors.xml
===================================================================
--- trunk/arbitrary/connectors.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/arbitrary/connectors.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 105, Lines Deleted: 84; 6444 bytes
@@ -18,7 +18,8 @@
<abstract>
<para>
- This manual describes the Connectors and APIs that can be used with MySQL.
+ This manual describes the Connectors and APIs that can be used
+ with MySQL.
</para>
<para>
@@ -35,91 +36,111 @@
</bookinfo>
-<preface id="connectors-intro">
- <title>Connectors</title>
- <indexterm>
- <primary>Connectors</primary>
- <secondary>MySQL</secondary>
- </indexterm>
- <indexterm>
- <primary>Connector/ODBC</primary>
- </indexterm>
- <indexterm>
- <primary>Connector/JDBC</primary>
- </indexterm>
- <indexterm>
- <primary>Connector/NET</primary>
- </indexterm>
- <indexterm>
- <primary>Visual Studio Plugin</primary>
- </indexterm>
- <indexterm>
- <primary>Connector/MXJ</primary>
- </indexterm>
- <para>
- This chapter describes MySQL Connectors, drivers that provide
- connectivity to the MySQL server for client programs. There are
- currently five MySQL Connectors:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Connector/ODBC provides driver support for connecting to a MySQL
- server using the Open Database Connectivity (ODBC) API. Support
- is available for ODBC connectivity from Windows, Unix and Mac OS
- X platforms.
- </para>
- </listitem>
- <listitem>
- <para>
- Connector/NET enables developers to create .NET applications
- that use data stored in a MySQL database. Connector/NET
- implements a fully-functional ADO.NET interface and provides
- support for use with ADO.NET aware tools. Applications that want
- to use Connector/NET can be written in any of the supported .NET
- languages.
- </para>
- </listitem>
- <listitem>
- <para>
- The MySQL Visual Studio Plugin works with Connector/NET and
- Visual Studio 2005. The plugin is a MySQL DDEX Provider, which
- means that you can use the schema and data manipulation tools
- within Visual Studio to create and edit objects within a MySQL
- database.
- </para>
- </listitem>
- <listitem>
- <para>
- Connector/J provides driver support for connecting to MySQL from
- a Java application using the standard Java Database Connectivity
- (JDBC) API.
- </para>
- </listitem>
- <listitem>
- <para>
- Connector/MXJ is a tool that enables easy deployment and
- management of MySQL server and database through your Java
- application.
- </para>
- </listitem>
- <listitem>
- <para>
- Connector/PHP is a Windows-only connector for PHP that provides
- the <literal>mysql</literal> and <literal>mysqli</literal>
- extensions for use with MySQL 5.0.18 and later.
- </para>
- </listitem>
- </itemizedlist>
- <para>
- For information on connecting to a MySQL server using other
- languages and interfaces than those detailed above, including Perl,
- Python and PHP for other platforms and environments, please refer to
- the <ulink url="http://dev.mysql.com/doc/refman/5.0/en/apis.html">APIs and Libraries</ulink> chapter.
- </para>
+ <preface id="connectors-intro">
-</preface>
+ <title>Connectors</title>
+ <indexterm>
+ <primary>Connectors</primary>
+ <secondary>MySQL</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>Connector/ODBC</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>Connector/JDBC</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>Connector/NET</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>Visual Studio Plugin</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>Connector/MXJ</primary>
+ </indexterm>
+
+ <para>
+ This chapter describes MySQL Connectors, drivers that provide
+ connectivity to the MySQL server for client programs. There are
+ currently five MySQL Connectors:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ Connector/ODBC provides driver support for connecting to a
+ MySQL server using the Open Database Connectivity (ODBC) API.
+ Support is available for ODBC connectivity from Windows, Unix
+ and Mac OS X platforms.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Connector/NET enables developers to create .NET applications
+ that use data stored in a MySQL database. Connector/NET
+ implements a fully-functional ADO.NET interface and provides
+ support for use with ADO.NET aware tools. Applications that
+ want to use Connector/NET can be written in any of the
+ supported .NET languages.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ The MySQL Visual Studio Plugin works with Connector/NET and
+ Visual Studio 2005. The plugin is a MySQL DDEX Provider, which
+ means that you can use the schema and data manipulation tools
+ within Visual Studio to create and edit objects within a MySQL
+ database.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Connector/J provides driver support for connecting to MySQL
+ from a Java application using the standard Java Database
+ Connectivity (JDBC) API.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Connector/MXJ is a tool that enables easy deployment and
+ management of MySQL server and database through your Java
+ application.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Connector/PHP is a Windows-only connector for PHP that
+ provides the <literal>mysql</literal> and
+ <literal>mysqli</literal> extensions for use with MySQL 5.0.18
+ and later.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
+ For information on connecting to a MySQL server using other
+ languages and interfaces than those detailed above, including
+ Perl, Python and PHP for other platforms and environments, please
+ refer to the
+ <ulink url="http://dev.mysql.com/doc/refman/5.0/en/apis.html">APIs
+ and Libraries</ulink> chapter.
+ </para>
+
+ </preface>
+
<!--SRCFILE connectors-->
<!--SRCFILE cnews-->
Modified: trunk/arbitrary/windows.xml
===================================================================
--- trunk/arbitrary/windows.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/arbitrary/windows.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 568 bytes
@@ -18,7 +18,8 @@
<abstract>
<para>
- This manual describes Windows specific MySQL installation and configuration issues.
+ This manual describes Windows specific MySQL installation and
+ configuration issues.
</para>
<para>
@@ -35,7 +36,6 @@
</bookinfo>
-
<!--SRCFILE windows-->
</book>
Modified: trunk/gui-common/chapter-options-introduction.xml
===================================================================
--- trunk/gui-common/chapter-options-introduction.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/gui-common/chapter-options-introduction.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 658 bytes
@@ -52,10 +52,10 @@
<literal>General Options</literal>, <literal>Connections</literal>,
and, on Windows only, <literal>Editors</literal>.
</para>
-
+
<para>
- There are three action buttons in the lower right corner
- of the window:
+ There are three action buttons in the lower right corner of the
+ window:
</para>
<itemizedlist>
Modified: trunk/gui-common/chapter-upgrade-all.xml
===================================================================
--- trunk/gui-common/chapter-upgrade-all.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/gui-common/chapter-upgrade-all.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 7; 810 bytes
@@ -43,14 +43,16 @@
<title>Upgrading – Linux</title>
- <para>
- <emphasis role="bold">Note</emphasis>: Workbench is not included
- in recent Linux releases of the &gui_tools;.
+ <note>
+ <para>
+ Workbench is not included in recent Linux releases of the
+ &gui_tools;.
- <remark>
- [PL] Change when applicable.
- </remark>
- </para>
+ <remark>
+ [PL] Change when applicable.
+ </remark>
+ </para>
+ </note>
<section id="guitools-tarball-upgrade">
Modified: trunk/gui-common/installation-all.xml
===================================================================
--- trunk/gui-common/installation-all.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/gui-common/installation-all.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 4; 1237 bytes
@@ -44,8 +44,8 @@
<para>
&gui_tools; run on recent 32-bit Windows NT based operating
- systems, including Windows 2000, XP, Vista, and 2003. They don't run on
- Windows NT 4 and below.
+ systems, including Windows 2000, XP, Vista, and 2003. They don't
+ run on Windows NT 4 and below.
</para>
<section id="gui-tools-windows-installer">
@@ -90,10 +90,16 @@
<para>
To install &gui_tools;, right click on the MSI file and select
- <guimenu>Install</guimenu>. <emphasis>Note</emphasis>:
- Installing &gui_tools; on Windows Vista requires administrative privileges.
+ <guimenu>Install</guimenu>.
</para>
+ <note>
+ <para>
+ Installing &gui_tools; on Windows Vista requires
+ administrative privileges.
+ </para>
+ </note>
+
<para>
At the <literal>Setup Type</literal> window you may choose a
<option>complete</option> or <option>custom</option>
Modified: trunk/gui-common/mysql-enterprise.xml
===================================================================
--- trunk/gui-common/mysql-enterprise.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/gui-common/mysql-enterprise.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 730 bytes
@@ -33,8 +33,8 @@
<listitem>
<para>
- The MySQL Enterprise Monitor – An automated
- virtual DBA assistant that monitors all your MySQL Servers
+ The MySQL Enterprise Monitor – An automated virtual DBA
+ assistant that monitors all your MySQL Servers
around-the-clock, identifies exceptions to MySQL best
practices, and provides expert advice on fixing any problems
discovered
Modified: trunk/mysqlqb/Makefile
===================================================================
--- trunk/mysqlqb/Makefile 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/mysqlqb/Makefile 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 640 bytes
@@ -57,7 +57,7 @@
cp $< $@
all-entities.ent: $(REPO_ROOT)/refman-5.0/all-entities.ent
cp $< $@
-mysqlqb_functions.xml: $(REPO_ROOT)/refman-5.0/dynxml-generated-functions.xml
+mysqlqb_functions.xml: $(REPO_ROOT)/refman-5.0/dynxml-local-functions.xml
cp $< $@
perl -pi.bak -e "s{functions-core.xml}{../refman-5.0/functions-core.xml}g" mysqlqb_functions.xml
mysqlqb_statements.xml: $(REPO_ROOT)/refman-5.0/sql-syntax.xml
Modified: trunk/mysqltest/command-reference.xml
===================================================================
--- trunk/mysqltest/command-reference.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/mysqltest/command-reference.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 4, Lines Added: 18, Lines Deleted: 17; 3267 bytes
@@ -93,11 +93,11 @@
<listitem>
<para>
- A line that begins with <quote><literal>--</literal></quote> as
- the first non-whitespace content also is treated as a comment
- that extends to the end of the line. However, unlike
- <quote><literal>#</literal></quote> comments, if the first word
- of the comment is a valid <command>mysqltest</command>
+ A line that begins with <quote><literal>--</literal></quote>
+ as the first non-whitespace content also is treated as a
+ comment that extends to the end of the line. However, unlike
+ <quote><literal>#</literal></quote> comments, if the first
+ word of the comment is a valid <command>mysqltest</command>
command, <command>mysqltest</command> executes the line from
that word to the end of the line as a command.
</para>
@@ -200,11 +200,11 @@
<para>
On a multiple-line command, <quote><literal>#</literal></quote> or
- <quote><literal>--</literal></quote> at the beginning of the second
- or following lines is not special. Thus, the second and third
- lines of the following variable-assignment command are not taken
- as comments. Instead, the variable <literal>$a</literal> is set to
- a value that contains two linefeed characters:
+ <quote><literal>--</literal></quote> at the beginning of the
+ second or following lines is not special. Thus, the second and
+ third lines of the following variable-assignment command are not
+ taken as comments. Instead, the variable <literal>$a</literal> is
+ set to a value that contains two linefeed characters:
</para>
<programlisting>
@@ -223,16 +223,17 @@
<listitem>
<para>
- A <quote><literal>--</literal></quote> comment is terminated by
- a newline, regardless of how many delimiters it contains.
+ A <quote><literal>--</literal></quote> comment is terminated
+ by a newline, regardless of how many delimiters it contains.
</para>
</listitem>
<listitem>
<para>
- A normal command (without <quote><literal>--</literal></quote>)
- is terminated by the delimiter (semicolon), no matter how many
- newlines it contains.
+ A normal command (without
+ <quote><literal>--</literal></quote>) is terminated by the
+ delimiter (semicolon), no matter how many newlines it
+ contains.
</para>
</listitem>
@@ -296,8 +297,8 @@
to conn1</literal> as a comment currently, but if
<command>mysqltest</command> is extended in the future to add a
<literal>switch</literal> command, that line will be treated as a
- command instead. If you use <quote><literal>#</literal></quote> for
- all comments, this problem will not occur.
+ command instead. If you use <quote><literal>#</literal></quote>
+ for all comments, this problem will not occur.
</para>
<para>
Modified: trunk/mysqltest/tutorial.xml
===================================================================
--- trunk/mysqltest/tutorial.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/mysqltest/tutorial.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 914 bytes
@@ -413,8 +413,8 @@
A comment in a test case can be started with the
<quote><literal>#</literal></quote> character or the
<quote><literal>--</literal></quote> characters. However, if the
- first word after the <quote><literal>--</literal></quote> is a word
- that <command>mysqltest</command> recognizes as a command,
+ first word after the <quote><literal>--</literal></quote> is a
+ word that <command>mysqltest</command> recognizes as a command,
<command>mysqltest</command> will execute the comment as a
command. For this reason, it is safest to use the
<quote><literal>#</literal></quote> character for comments, so as
Modified: trunk/ndbapi/class-member-template.xml
===================================================================
--- trunk/ndbapi/class-member-template.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/ndbapi/class-member-template.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 7; 765 bytes
@@ -4,14 +4,13 @@
<title><literal></literal></title>
- <indexterm>
- <primary><literal>()</literal></primary>
- </indexterm>
+ <indexterm>
+ <primary><literal>()</literal></primary>
+ </indexterm>
- <indexterm>
- <primary><literal>()</literal> (method of
- <literal></literal>)</primary>
- </indexterm>
+ <indexterm>
+ <primary><literal>()</literal> (method of <literal></literal>)</primary>
+ </indexterm>
<formalpara>
Modified: trunk/ndbapi/ndb-internals.xml
===================================================================
--- trunk/ndbapi/ndb-internals.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/ndbapi/ndb-internals.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 7; 1082 bytes
@@ -87,13 +87,14 @@
the data node.
</para>
- <para>
- <emphasis role="bold">Note</emphasis>: This file is
- created only if the
- <link linkend="mysql-cluster-param-tcp-definition-sendsignalid"><literal>SendSignalId</literal></link>
- parameter is enabled, which is true only for
- <literal>-debug</literal> builds.
- </para>
+ <note>
+ <para>
+ This file is created only if the
+ <link linkend="mysql-cluster-param-tcp-definition-sendsignalid"><literal>SendSignalId</literal></link>
+ parameter is enabled, which is true only for
+ <literal>-debug</literal> builds.
+ </para>
+ </note>
</listitem>
<listitem>
Modified: trunk/ndbapi/ndbrecord-tmp.xml
===================================================================
--- trunk/ndbapi/ndbrecord-tmp.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/ndbapi/ndbrecord-tmp.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 4; 1256 bytes
@@ -12,9 +12,10 @@
&mccge-warning-section;
<para>
- <literal>NdbRecord</literal> is an interface which provides a mapping to a full or a
- partial record stored in <literal>NDB</literal>. In the latter case,
- it can be used in conjunction with a bitmap to assist in access.
+ <literal>NdbRecord</literal> is an interface which provides a
+ mapping to a full or a partial record stored in
+ <literal>NDB</literal>. In the latter case, it can be used in
+ conjunction with a bitmap to assist in access.
<literal>NdbRecord</literal> is available in &mccge-series; releases
beginning with MySQL 5.1.19-ndb-6.2.3.
</para>
@@ -151,6 +152,7 @@
<literal>NdbIndexScanOperation</literal> is introduced.
<literal><link linkend="class-ndbindexscanoperation-indexBound">NdbIndexScanOperation::indexBound</link></literal>
is a structure used to describe index scan bounds for
- <literal>NdbRecord</literal> scans.</para>
+ <literal>NdbRecord</literal> scans.
+ </para>
</section>
Modified: trunk/query-browser/connection-dialog.xml
===================================================================
--- trunk/query-browser/connection-dialog.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/query-browser/connection-dialog.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 16; 1881 bytes
@@ -55,27 +55,25 @@
Options</link> section of the
<link linkend="mysql-gui-options">Options dialog</link>.
</para>
-
+
<para>
- The nature of the connection to the MySQL server varies
- depending upon the value specified in the
- <guilabel>Server Host:</guilabel> text box.
+ The nature of the connection to the MySQL server varies depending
+ upon the value specified in the <guilabel>Server Host:</guilabel>
+ text box.
</para>
-
+
<para>
- Under Linux and Mac OS X the connection to the MySQL server will be
- a socket connection if <quote>localhost</quote> is used
- in the <guilabel>Server Host:</guilabel> text box. Specifying
- <literal>127.0.0.1</literal>, the actual IP address
- that hosts the MySQL server, or the host name results
- in a TCP connection.
+ Under Linux and Mac OS X the connection to the MySQL server will
+ be a socket connection if <quote>localhost</quote> is used in the
+ <guilabel>Server Host:</guilabel> text box. Specifying
+ <literal>127.0.0.1</literal>, the actual IP address that hosts the
+ MySQL server, or the host name results in a TCP connection.
</para>
-
+
<para>
- Under Windows, the connection is always a TCP connection
- unless you connect using named pipes. This is discussed in
- what follows.
- </para>
+ Under Windows, the connection is always a TCP connection unless
+ you connect using named pipes. This is discussed in what follows.
+ </para>
<para>
To set advanced connection options, click the
Modified: trunk/quick-guides/mysqld-vs-optvar-core.xml
===================================================================
--- trunk/quick-guides/mysqld-vs-optvar-core.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/quick-guides/mysqld-vs-optvar-core.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 92, Lines Deleted: 93; 6864 bytes
@@ -5,114 +5,113 @@
<!ENTITY % all.entities SYSTEM "all-entities.ent">
%all.entities;
]>
+<chapter id="optvar-version-summmary">
- <chapter id="optvar-version-summmary">
+ <title>MySQL <literal>mysqld</literal> Options/Variables Reference</title>
- <title>MySQL <literal>mysqld</literal> Options/Variables Reference</title>
+ <para>
+ The table below shows all the options and variables available across
+ all versions of the <literal>mysqld</literal> server. The columns
+ are as follows:
+ </para>
- <para>
- The table below shows all the options and variables available
- across all versions of the <literal>mysqld</literal> server. The
- columns are as follows:
- </para>
+ <itemizedlist>
- <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis role="bold">Name</emphasis> — the name of the
+ option or variable.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Name</emphasis> — the name of the
- option or variable.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">In.</emphasis> — the version in
+ which the option or variable was introduced in
+ <literal>mysqld</literal>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">In.</emphasis> — the version in
- which the option or variable was introduced in
- <literal>mysqld</literal>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">Dep.</emphasis> — the version of
+ <literal>mysqld</literal> in which the option or variable was
+ deprecated.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Dep.</emphasis> — the version of
- <literal>mysqld</literal> in which the option or variable was
- deprecated.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">Cmd</emphasis> — indicates whether
+ the option/variable is valid on the command line.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Cmd</emphasis> — indicates whether
- the option/variable is valid on the command line.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">File</emphasis> — indicates whether
+ the option is valid within a configuration file.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">File</emphasis> — indicates
- whether the option is valid within a configuration file.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">Srvr</emphasis> — indicates whether
+ the variable is a server system variable.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Srvr</emphasis> — indicates
- whether the variable is a server system variable.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">Stat.</emphasis> — indicates whether
+ the variable is a status variable.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Stat.</emphasis> — indicates
- whether the variable is a status variable.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">Scp.</emphasis> — indicates the
+ scope of the variable (session-specific, global, or both).
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Scp.</emphasis> — indicates the
- scope of the variable (session-specific, global, or both).
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">Dyn.</emphasis> — indicates whether
+ the variable is dynamically settable while the server is
+ running.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">Dyn.</emphasis> — indicates
- whether the variable is dynamically settable while the server
- is running.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">4.1</emphasis> — indicates if the
+ option/variable is available in the MySQL 4.1 series. If more
+ information is available in the main reference manual, the
+ indication will be a link to the correct part of the manual.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">4.1</emphasis> — indicates if the
- option/variable is available in the MySQL 4.1 series. If more
- information is available in the main reference manual, the
- indication will be a link to the correct part of the manual.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">5.0</emphasis> — indicates if the
+ option/variable is available in the MySQL 5.0 series. If more
+ information is available in the main reference manual, the
+ indication will be a link to the correct part of the manual.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">5.0</emphasis> — indicates if the
- option/variable is available in the MySQL 5.0 series. If more
- information is available in the main reference manual, the
- indication will be a link to the correct part of the manual.
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis role="bold">5.1</emphasis> — indicates if the
+ option/variable is available in the MySQL 5.1 series. If more
+ information is available in the main reference manual, the
+ indication will be a link to the correct part of the manual.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <emphasis role="bold">5.1</emphasis> — indicates if the
- option/variable is available in the MySQL 5.1 series. If more
- information is available in the main reference manual, the
- indication will be a link to the correct part of the manual.
- </para>
- </listitem>
+ </itemizedlist>
- </itemizedlist>
+ <para condition="dynamic:optvar:versionsummary" role="all:mysqld:all"/>
- <para condition="dynamic:optvar:versionsummary" role="all:mysqld:all"/>
-
- </chapter>
+</chapter>
Modified: trunk/quick-guides/mysqld-vs.xml
===================================================================
--- trunk/quick-guides/mysqld-vs.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/quick-guides/mysqld-vs.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 456 bytes
@@ -39,7 +39,7 @@
</bookinfo>
- <xi:include href="dynxml-local-mysqld-vs-optvar.xml"
+ <xi:include href="dynxml-local-mysqld-vs-optvar.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
</book>
Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/Makefile.depends 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 8, Lines Added: 20, Lines Deleted: 4; 3390 bytes
@@ -231,9 +231,9 @@
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/information-sources.idmap \
../refman-common/metadata/news-cj-core.idmap \
+ ../refman-common/metadata/news-cmxj-core.idmap \
+ ../refman-common/metadata/news-cnet-core.idmap \
../refman-common/metadata/news-codbc-core.idmap \
- ../refman-common/metadata/news-connector-mxj.idmap \
- ../refman-common/metadata/news-connector-net.idmap \
metadata/apis-c.idmap \
metadata/apis.idmap \
metadata/charset.idmap \
@@ -316,6 +316,9 @@
dynxml_common_news_cmxj_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
+ ../dynamic-docs/changelog/connector-mxj-versions.xml \
+ ../dynamic-docs/changelog/connector-mxj.xml \
+ ../refman-common/news-cmxj-core.xml \
../refman-common/urls.ent \
all-entities.ent \
versions.ent
@@ -334,6 +337,9 @@
dynxml_common_news_cnet_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
+ ../dynamic-docs/changelog/connector-net-versions.xml \
+ ../dynamic-docs/changelog/connector-net.xml \
+ ../refman-common/news-cnet-core.xml \
../refman-common/urls.ent \
all-entities.ent \
versions.ent
@@ -706,6 +712,10 @@
../common/phrases.ent \
../dynamic-docs/changelog/connector-j-versions.xml \
../dynamic-docs/changelog/connector-j.xml \
+ ../dynamic-docs/changelog/connector-mxj-versions.xml \
+ ../dynamic-docs/changelog/connector-mxj.xml \
+ ../dynamic-docs/changelog/connector-net-versions.xml \
+ ../dynamic-docs/changelog/connector-net.xml \
../dynamic-docs/changelog/connector-odbc-versions.xml \
../dynamic-docs/changelog/connector-odbc.xml \
../dynamic-docs/changelog/mysql-proxy-versions.xml \
@@ -779,6 +789,8 @@
../refman-common/mysql-proxy.xml \
../refman-common/news-cj-core.xml \
../refman-common/news-cluster.xml \
+ ../refman-common/news-cmxj-core.xml \
+ ../refman-common/news-cnet-core.xml \
../refman-common/news-codbc-core.xml \
../refman-common/news-innodb.xml \
../refman-common/news-mysql-proxy-core.xml \
@@ -912,8 +924,6 @@
../ndbapi/metadata/ndb-internals.idmap \
../ndbapi/metadata/ndbapi.idmap \
../refman-common/metadata/gpl-license.idmap \
- ../refman-common/metadata/news-connector-mxj.idmap \
- ../refman-common/metadata/news-connector-net.idmap \
metadata/apis-c.idmap \
metadata/apis.idmap \
metadata/charset.idmap \
@@ -1431,6 +1441,10 @@
../common/phrases.ent \
../dynamic-docs/changelog/connector-j-versions.xml \
../dynamic-docs/changelog/connector-j.xml \
+ ../dynamic-docs/changelog/connector-mxj-versions.xml \
+ ../dynamic-docs/changelog/connector-mxj.xml \
+ ../dynamic-docs/changelog/connector-net-versions.xml \
+ ../dynamic-docs/changelog/connector-net.xml \
../dynamic-docs/changelog/connector-odbc-versions.xml \
../dynamic-docs/changelog/connector-odbc.xml \
../dynamic-docs/changelog/mysql-proxy-versions.xml \
@@ -1439,6 +1453,8 @@
../refman-common/all-entities.ent \
../refman-common/news-cj-core.xml \
../refman-common/news-cluster.xml \
+ ../refman-common/news-cmxj-core.xml \
+ ../refman-common/news-cnet-core.xml \
../refman-common/news-codbc-core.xml \
../refman-common/news-innodb.xml \
../refman-common/news-mysql-proxy-core.xml \
Modified: trunk/refman-4.1/apis-c.xml
===================================================================
--- trunk/refman-4.1/apis-c.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/apis-c.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 5, Lines Added: 13, Lines Deleted: 13; 3313 bytes
@@ -5366,8 +5366,8 @@
<row>
<entry><literal>multi-statements</literal></entry>
<entry>Allow the client to send multiple statements in a single string
- (separated by <quote><literal>;</literal></quote>). Added
- in 4.1.9.</entry>
+ (separated by <quote><literal>;</literal></quote>).
+ Added in 4.1.9.</entry>
</row>
<row>
<entry><literal>password</literal></entry>
@@ -5564,9 +5564,9 @@
<literal>mysql_query()</literal> cannot be used for statements
that contain binary data; you must use
<literal>mysql_real_query()</literal> instead. (Binary data may
- contain the <quote><literal>\0</literal></quote> character, which
- <literal>mysql_query()</literal> interprets as the end of the
- statement string.)
+ contain the <quote><literal>\0</literal></quote> character,
+ which <literal>mysql_query()</literal> interprets as the end of
+ the statement string.)
</para>
<para>
@@ -5830,9 +5830,9 @@
<entry><literal>CLIENT_MULTI_STATEMENTS</literal></entry>
<entry>Tell the server that the client may send multiple statements in a single
string (separated by
- <quote><literal>;</literal></quote>). If this flag is
- not set, multiple-statement execution is disabled.
- See the note following this table for more
+ <quote><literal>;</literal></quote>). If this flag
+ is not set, multiple-statement execution is
+ disabled. See the note following this table for more
information about this flag. Added in MySQL 4.1.</entry>
</row>
<row>
@@ -6266,9 +6266,9 @@
<literal>mysql_query()</literal> cannot be used for statements
that contain binary data; you must use
<literal>mysql_real_query()</literal> instead. (Binary data may
- contain the <quote><literal>\0</literal></quote> character, which
- <literal>mysql_query()</literal> interprets as the end of the
- statement string.) In addition,
+ contain the <quote><literal>\0</literal></quote> character,
+ which <literal>mysql_query()</literal> interprets as the end of
+ the statement string.) In addition,
<literal>mysql_real_query()</literal> is faster than
<literal>mysql_query()</literal> because it does not call
<literal>strlen()</literal> on the statement string.
@@ -11436,8 +11436,8 @@
a status value. The string length should be given by the
<literal>length</literal> argument. The string must consist of a
single SQL statement. You should not add a terminating semicolon
- (<quote><literal>;</literal></quote>) or <literal>\g</literal> to
- the statement.
+ (<quote><literal>;</literal></quote>) or <literal>\g</literal>
+ to the statement.
</para>
<para>
Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/charset.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 5, Lines Added: 16, Lines Deleted: 15; 3979 bytes
@@ -147,10 +147,11 @@
<para>
Suppose that we want to compare two string values,
<quote><literal>A</literal></quote> and
- <quote><literal>B</literal></quote>. The simplest way to do this is
- to look at the encodings: 0 for <quote><literal>A</literal></quote>
- and 1 for <quote><literal>B</literal></quote>. Because 0 is less
- than 1, we say <quote><literal>A</literal></quote> is less than
+ <quote><literal>B</literal></quote>. The simplest way to do this
+ is to look at the encodings: 0 for
+ <quote><literal>A</literal></quote> and 1 for
+ <quote><literal>B</literal></quote>. Because 0 is less than 1, we
+ say <quote><literal>A</literal></quote> is less than
<quote><literal>B</literal></quote>. What we've just done is apply
a collation to our character set. The collation is a set of rules
(only one rule in this case): <quote>compare the
@@ -161,8 +162,8 @@
<para>
But what if we want to say that the lowercase and uppercase
letters are equivalent? Then we would have at least two rules: (1)
- treat the lowercase letters <quote><literal>a</literal></quote> and
- <quote><literal>b</literal></quote> as equivalent to
+ treat the lowercase letters <quote><literal>a</literal></quote>
+ and <quote><literal>b</literal></quote> as equivalent to
<quote><literal>A</literal></quote> and
<quote><literal>B</literal></quote>; (2) then compare the
encodings. We call this a <firstterm>case-insensitive</firstterm>
@@ -179,8 +180,8 @@
whether to distinguish lettercase, but also for whether to
distinguish accents (an <quote>accent</quote> is a mark attached
to a character as in German
- <quote><literal>Ö</literal></quote>), and for multiple-character
- mappings (such as the rule that
+ <quote><literal>Ö</literal></quote>), and for
+ multiple-character mappings (such as the rule that
<quote><literal>Ö</literal></quote> =
<quote><literal>OE</literal></quote> in one of the two German
collations).
@@ -977,8 +978,8 @@
<literal>05</literal> and <literal>5C</literal>) is a valid
multi-byte character. Hence, the first two bytes of the string
are interpreted as a single <literal>sjis</literal> character,
- and the <quote><literal>\</literal></quote> is not intrepreted as
- an escape character. The following
+ and the <quote><literal>\</literal></quote> is not intrepreted
+ as an escape character. The following
<quote><literal>n</literal></quote> (hex value
<literal>6E</literal>) is not interpreted as part of an escape
sequence. This is true even for the second string; the
@@ -3652,12 +3653,12 @@
modern Spanish and traditional Spanish, respectively. In both
collations, <quote><literal>ñ</literal></quote> (n-tilde) is a
separate letter between <quote><literal>n</literal></quote> and
- <quote><literal>o</literal></quote>. In addition, for traditional
- Spanish, <quote><literal>ch</literal></quote> is a separate
- letter between <quote><literal>c</literal></quote> and
+ <quote><literal>o</literal></quote>. In addition, for
+ traditional Spanish, <quote><literal>ch</literal></quote> is a
+ separate letter between <quote><literal>c</literal></quote> and
<quote><literal>d</literal></quote>, and
- <quote><literal>ll</literal></quote> is a separate letter between
- <quote><literal>l</literal></quote> and
+ <quote><literal>ll</literal></quote> is a separate letter
+ between <quote><literal>l</literal></quote> and
<quote><literal>m</literal></quote>
</para>
Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/client-utility-programs.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 3, Lines Added: 14, Lines Deleted: 14; 3358 bytes
@@ -2422,9 +2422,9 @@
directory paths that are used successively in round-robin
fashion for creating temporary files. The separator
character between directory names should be colon
- (<quote><literal>:</literal></quote>) on Unix and semicolon
- (<quote><literal>;</literal></quote>) on Windows, NetWare,
- and OS/2.
+ (<quote><literal>:</literal></quote>) on Unix and
+ semicolon (<quote><literal>;</literal></quote>) on
+ Windows, NetWare, and OS/2.
</para>
</listitem>
@@ -4574,8 +4574,8 @@
Disable named commands. Use the <literal>\*</literal> form
only, or use named commands only at the beginning of a
line ending with a semicolon
- (<quote><literal>;</literal></quote>). As of MySQL 3.23.22,
- <command>mysql</command> starts with this option
+ (<quote><literal>;</literal></quote>). As of MySQL
+ 3.23.22, <command>mysql</command> starts with this option
<emphasis>enabled</emphasis> by default. However, even
with this option, long-format commands still work from the
first line. See <xref linkend="mysql-commands"/>.
@@ -13317,21 +13317,21 @@
(<quote><literal>*</literal></quote>,
<quote><literal>?</literal></quote>,
<quote><literal>%</literal></quote>, or
- <quote><literal>_</literal></quote>), only those names that are
- matched by the wildcard are shown. If a database name contains
- any underscores, those should be escaped with a backslash
- (some Unix shells require two) to get a list of the proper
- tables or columns. <quote><literal>*</literal></quote> and
- <quote><literal>?</literal></quote> characters are converted
- into SQL <quote><literal>%</literal></quote> and
+ <quote><literal>_</literal></quote>), only those names that
+ are matched by the wildcard are shown. If a database name
+ contains any underscores, those should be escaped with a
+ backslash (some Unix shells require two) to get a list of the
+ proper tables or columns. <quote><literal>*</literal></quote>
+ and <quote><literal>?</literal></quote> characters are
+ converted into SQL <quote><literal>%</literal></quote> and
<quote><literal>_</literal></quote> wildcard characters. This
might cause some confusion when you try to display the columns
for a table with a <quote><literal>_</literal></quote> in the
name, because in this case, <command>mysqlshow</command> shows
you only the table names that match the pattern. This is
easily fixed by adding an extra
- <quote><literal>%</literal></quote> last on the command line as
- a separate argument.
+ <quote><literal>%</literal></quote> last on the command line
+ as a separate argument.
</para>
<para>
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/data-types.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1034 bytes
@@ -3005,9 +3005,9 @@
The relaxed format allowed for values specified as strings
can be deceiving. For example, a value such as
<literal>'10:11:12'</literal> might look like a time value
- because of the <quote><literal>:</literal></quote> delimiter,
- but if used in a date context is interpreted as the year
- <literal>'2010-11-12'</literal>. The value
+ because of the <quote><literal>:</literal></quote>
+ delimiter, but if used in a date context is interpreted as
+ the year <literal>'2010-11-12'</literal>. The value
<literal>'10:45:15'</literal> is converted to
<literal>'0000-00-00'</literal> because
<literal>'45'</literal> is not a legal month.
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/dba-core.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 15, Lines Deleted: 5; 1641 bytes
@@ -5306,10 +5306,15 @@
prefer the key cache method. This is mainly used to force
long character keys in large tables to use the slower key
cache method to create the index. This variable was added
- in MySQL 3.23.37. <emphasis role="bold">Note</emphasis>:
- The value is given in megabytes before 4.0.3 and in bytes
- thereafter.
+ in MySQL 3.23.37.
</para>
+
+ <note>
+ <para>
+ The value is given in megabytes before 4.0.3 and in
+ bytes thereafter.
+ </para>
+ </note>
</listitem>
<listitem>
@@ -5326,10 +5331,15 @@
would be larger than this value, the index is created
using the key cache instead, which is slower. This
variable was added in MySQL 3.23.37.
- <emphasis role="bold">Note</emphasis>: The value is given
- in megabytes before 4.0.3 and in bytes thereafter.
</para>
+ <note>
+ <para>
+ The value is given in megabytes before 4.0.3 and in
+ bytes thereafter.
+ </para>
+ </note>
+
<para>
The default value is 2GB. If <literal>MyISAM</literal>
index files exceed this size and disk space is available,
Modified: trunk/refman-4.1/errors-problems.xml
===================================================================
--- trunk/refman-4.1/errors-problems.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/errors-problems.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 4; 1124 bytes
@@ -3394,12 +3394,16 @@
characters (<quote><literal>:</literal></quote>) on Unix and
semicolon characters (<quote><literal>;</literal></quote>) on
Windows, NetWare, and OS/2.
- <emphasis role="bold">Note</emphasis>: To spread the load
- effectively, these paths should be located on different
- <emphasis>physical</emphasis> disks, not different partitions
- of the same disk.
</para>
+ <note>
+ <para>
+ To spread the load effectively, these paths should be
+ located on different <emphasis>physical</emphasis> disks,
+ not different partitions of the same disk.
+ </para>
+ </note>
+
<para>
If the MySQL server is acting as a replication slave, you
should not set <option>--tmpdir</option> to point to a
Modified: trunk/refman-4.1/extending-mysql.xml
===================================================================
--- trunk/refman-4.1/extending-mysql.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/extending-mysql.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 3; 912 bytes
@@ -1567,11 +1567,16 @@
subsequent rows processed by the statement in which
<literal>XXX()</literal> was invoked.
(<literal>xxx()</literal> is not even called for subsequent
- rows.) <emphasis role="bold">Note</emphasis>: Before MySQL
- 3.22.10, you should set both <literal>*error</literal> and
- <literal>*is_null</literal>:
+ rows.)
</para>
+ <note>
+ <para>
+ Before MySQL 3.22.10, you should set both
+ <literal>*error</literal> and <literal>*is_null</literal>:
+ </para>
+ </note>
+
<programlisting>
*error = 1;
*is_null = 1;
Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/functions-core.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 20, Lines Deleted: 10; 2194 bytes
@@ -869,11 +869,16 @@
arguments are of the same type. Otherwise type conversion
takes place according to the rules described in
<xref linkend="type-conversion"/>, but applied to all the
- three arguments. <emphasis role="bold">Note</emphasis>:
- Before MySQL 4.0.5, arguments were converted to the type of
- <replaceable>expr</replaceable> instead.
+ three arguments.
</para>
+ <note>
+ <para>
+ Before MySQL 4.0.5, arguments were converted to the type
+ of <replaceable>expr</replaceable> instead.
+ </para>
+ </note>
+
<remark role="help-description-end"/>
<remark role="help-example"/>
@@ -12061,14 +12066,19 @@
<para>
Then recompile MySQL. There is no need to rebuild the
- indexes in this case. <emphasis role="bold">Note</emphasis>:
- By making this change, you <emphasis>severely</emphasis>
- decrease MySQL's ability to provide adequate relevance
- values for the <literal>MATCH()</literal> function. If you
- really need to search for such common words, it would be
- better to search using <literal>IN BOOLEAN MODE</literal>
- instead, which does not observe the 50% threshold.
+ indexes in this case.
</para>
+
+ <note>
+ <para>
+ By making this change, you <emphasis>severely</emphasis>
+ decrease MySQL's ability to provide adequate relevance
+ values for the <literal>MATCH()</literal> function. If you
+ really need to search for such common words, it would be
+ better to search using <literal>IN BOOLEAN MODE</literal>
+ instead, which does not observe the 50% threshold.
+ </para>
+ </note>
</listitem>
<listitem>
Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/introduction.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 6; 1400 bytes
@@ -2652,12 +2652,12 @@
start-comment sequence. MySQL Server uses
<quote><literal>#</literal></quote> as the start comment
character. MySQL Server 3.23.3 and up also supports a variant
- of the <quote><literal>--</literal></quote> comment style. That
- is, the <quote><literal>--</literal></quote> start-comment
- sequence must be followed by a space (or by a control
- character such as a newline). The space is required to prevent
- problems with automatically generated SQL queries that use
- constructs such as the following, where we automatically
+ of the <quote><literal>--</literal></quote> comment style.
+ That is, the <quote><literal>--</literal></quote>
+ start-comment sequence must be followed by a space (or by a
+ control character such as a newline). The space is required to
+ prevent problems with automatically generated SQL queries that
+ use constructs such as the following, where we automatically
insert the value of the payment for
<literal>payment</literal>:
</para>
Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/language-structure.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 4, Lines Added: 15, Lines Deleted: 13; 2748 bytes
@@ -346,10 +346,10 @@
<para>
The ASCII 26 character can be encoded as
- <quote><literal>\Z</literal></quote> to enable you to work around
- the problem that ASCII 26 stands for END-OF-FILE on Windows.
- ASCII 26 within a file causes problems if you try to use
- <literal>mysql <replaceable>db_name</replaceable> <
+ <quote><literal>\Z</literal></quote> to enable you to work
+ around the problem that ASCII 26 stands for END-OF-FILE on
+ Windows. ASCII 26 within a file causes problems if you try to
+ use <literal>mysql <replaceable>db_name</replaceable> <
<replaceable>file_name</replaceable></literal>.
</para>
@@ -363,8 +363,9 @@
<para>
The <quote><literal>\%</literal></quote> and
- <quote><literal>\_</literal></quote> sequences are used to search
- for literal instances of <quote><literal>%</literal></quote> and
+ <quote><literal>\_</literal></quote> sequences are used to
+ search for literal instances of
+ <quote><literal>%</literal></quote> and
<quote><literal>_</literal></quote> in pattern-matching contexts
where they would otherwise be interpreted as wildcard
characters. See the description of the <literal>LIKE</literal>
@@ -869,17 +870,18 @@
Database names cannot contain
<quote><literal>/</literal></quote>,
<quote><literal>\</literal></quote>,
- <quote><literal>.</literal></quote>, or characters that are not
- allowed in a directory name.
+ <quote><literal>.</literal></quote>, or characters that are
+ not allowed in a directory name.
</para>
</listitem>
<listitem>
<para>
- Table names cannot contain <quote><literal>/</literal></quote>,
+ Table names cannot contain
+ <quote><literal>/</literal></quote>,
<quote><literal>\</literal></quote>,
- <quote><literal>.</literal></quote>, or characters that are not
- allowed in a filename.
+ <quote><literal>.</literal></quote>, or characters that are
+ not allowed in a filename.
</para>
</listitem>
@@ -2091,8 +2093,8 @@
<listitem>
<para>
- From a <quote><literal>#</literal></quote> character to the end
- of the line.
+ From a <quote><literal>#</literal></quote> character to the
+ end of the line.
</para>
</listitem>
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/sql-syntax.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 7; 1486 bytes
@@ -10138,11 +10138,11 @@
<para>
<replaceable>col_name</replaceable> can be a column name, or a
- string containing the SQL <quote><literal>%</literal></quote> and
- <quote><literal>_</literal></quote> wildcard characters to obtain
- output only for the columns with names matching the string.
- There is no need to enclose the string within quotes unless it
- contains spaces or other special characters.
+ string containing the SQL <quote><literal>%</literal></quote>
+ and <quote><literal>_</literal></quote> wildcard characters to
+ obtain output only for the columns with names matching the
+ string. There is no need to enclose the string within quotes
+ unless it contains spaces or other special characters.
</para>
<programlisting>
@@ -16170,8 +16170,8 @@
<para>
How the column is sorted in the index. In MySQL, this can
- have values <quote><literal>A</literal></quote> (Ascending)
- or <literal>NULL</literal> (Not sorted).
+ have values <quote><literal>A</literal></quote>
+ (Ascending) or <literal>NULL</literal> (Not sorted).
</para>
</listitem>
Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/storage-engines.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 5, Lines Added: 22, Lines Deleted: 13; 2277 bytes
@@ -785,9 +785,13 @@
<para>
The size of the tree cache used in bulk insert optimization.
- <emphasis role="bold">Note</emphasis>: This is a limit
- <emphasis>per thread</emphasis>!
</para>
+
+ <note>
+ <para>
+ This is a limit <emphasis>per thread</emphasis>!
+ </para>
+ </note>
</listitem>
<listitem>
@@ -798,10 +802,14 @@
<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 parameter is
- given in megabytes before MySQL 4.0.3, and in bytes as of
- 4.0.3.
</para>
+
+ <note>
+ <para>
+ This parameter is given in megabytes before MySQL 4.0.3,
+ and in bytes as of 4.0.3.
+ </para>
+ </note>
</listitem>
<listitem>
@@ -817,9 +825,14 @@
the file size would be larger than this value, the index is
created using the key cache instead, which is slower. This
variable was added in MySQL 3.23.37.
- <emphasis role="bold">Note</emphasis>: The value is given in
- megabytes before 4.0.3 and in bytes thereafter.
</para>
+
+ <note>
+ <para>
+ The value is given in megabytes before 4.0.3 and in bytes
+ thereafter.
+ </para>
+ </note>
</listitem>
<listitem>
@@ -1331,10 +1344,7 @@
</itemizedlist>
- <formalpara>
-
- <title>Note</title>
-
+ <note>
<para>
While a compressed table is read-only, and you cannot
therefore update or add rows in the table, DDL (Data
@@ -1343,9 +1353,8 @@
the table, and <literal>TRUNCATE</literal> to empty the
table.
</para>
+ </note>
- </formalpara>
-
</section>
</section>
Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-4.1/tutorial.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 8, Lines Added: 19, Lines Deleted: 15; 3754 bytes
@@ -499,8 +499,8 @@
The <literal>'></literal> and <literal>"></literal> prompts
occur during string collection (another way of saying that MySQL
is waiting for completion of a string). In MySQL, you can write
- strings surrounded by either <quote><literal>'</literal></quote> or
- <quote><literal>"</literal></quote> characters (for example,
+ strings surrounded by either <quote><literal>'</literal></quote>
+ or <quote><literal>"</literal></quote> characters (for example,
<literal>'hello'</literal> or <literal>"goodbye"</literal>), and
<command>mysql</command> lets you enter strings that span multiple
lines. When you see a <literal>'></literal> or
@@ -2086,7 +2086,8 @@
</programlisting>
<para>
- To find names ending with <quote><literal>fy</literal></quote>:
+ To find names ending with
+ <quote><literal>fy</literal></quote>:
</para>
<programlisting>
@@ -2100,7 +2101,8 @@
</programlisting>
<para>
- To find names containing a <quote><literal>w</literal></quote>:
+ To find names containing a
+ <quote><literal>w</literal></quote>:
</para>
<programlisting>
@@ -2161,9 +2163,9 @@
<quote><literal>b</literal></quote>, or
<quote><literal>c</literal></quote>. To name a range of
characters, use a dash.
- <quote><literal>[a-z]</literal></quote> matches any letter,
- whereas <quote><literal>[0-9]</literal></quote> matches any
- digit.
+ <quote><literal>[a-z]</literal></quote> matches any
+ letter, whereas <quote><literal>[0-9]</literal></quote>
+ matches any digit.
</para>
</listitem>
@@ -2173,9 +2175,9 @@
instances of the thing preceding it. For example,
<quote><literal>x*</literal></quote> matches any number of
<quote><literal>x</literal></quote> characters,
- <quote><literal>[0-9]*</literal></quote> matches any number
- of digits, and <quote><literal>.*</literal></quote> matches
- any number of anything.
+ <quote><literal>[0-9]*</literal></quote> matches any
+ number of digits, and <quote><literal>.*</literal></quote>
+ matches any number of anything.
</para>
</listitem>
@@ -2240,7 +2242,8 @@
<literal>REGEXP</literal> comparison to be case sensitive, use
the <literal>BINARY</literal> keyword to make one of the
strings a binary string. This query matches only lowercase
- <quote><literal>b</literal></quote> at the beginning of a name:
+ <quote><literal>b</literal></quote> at the beginning of a
+ name:
</para>
<programlisting>
@@ -2248,8 +2251,9 @@
</programlisting>
<para>
- To find names ending with <quote><literal>fy</literal></quote>,
- use <quote><literal>$</literal></quote> to match the end of the
+ To find names ending with
+ <quote><literal>fy</literal></quote>, use
+ <quote><literal>$</literal></quote> to match the end of the
name:
</para>
@@ -2264,8 +2268,8 @@
</programlisting>
<para>
- To find names containing a <quote><literal>w</literal></quote>,
- use this query:
+ To find names containing a
+ <quote><literal>w</literal></quote>, use this query:
</para>
<programlisting>
Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/Makefile.depends 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 4, Lines Added: 3, Lines Deleted: 6; 1950 bytes
@@ -234,9 +234,9 @@
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/information-sources.idmap \
../refman-common/metadata/news-cj-core.idmap \
+ ../refman-common/metadata/news-cmxj-core.idmap \
+ ../refman-common/metadata/news-cnet-core.idmap \
../refman-common/metadata/news-codbc-core.idmap \
- ../refman-common/metadata/news-connector-mxj.idmap \
- ../refman-common/metadata/news-connector-net.idmap \
metadata/apis-c.idmap \
metadata/apis.idmap \
metadata/charset.idmap \
@@ -415,7 +415,7 @@
dynxml_common_news_vstudioplugin_IMAGES =
dynxml_common_news_vstudioplugin_SOURCES = dynxml-common-news-vstudioplugin.xml $(dynxml_common_news_vstudioplugin_INCLUDES)
dynxml_common_news_vstudioplugin_IDMAPS = \
- ../refman-common/metadata/news-connector-net.idmap
+ ../refman-common/metadata/news-cnet-core.idmap
dynxml-common-news-vstudioplugin.validpure: $(dynxml_common_news_vstudioplugin_SOURCES)
dynxml-common-news-vstudioplugin.titles: $(dynxml_common_news_vstudioplugin_SOURCES)
dynxml-common-news-vstudioplugin.useless: $(dynxml_common_news_vstudioplugin_SOURCES)
@@ -1301,8 +1301,6 @@
../ndbapi/metadata/ndb-internals.idmap \
../ndbapi/metadata/ndbapi.idmap \
../refman-common/metadata/gpl-license.idmap \
- ../refman-common/metadata/news-connector-mxj.idmap \
- ../refman-common/metadata/news-connector-net.idmap \
metadata/apis-c.idmap \
metadata/apis.idmap \
metadata/charset.idmap \
@@ -1815,7 +1813,6 @@
news_SOURCES = news.xml $(news_INCLUDES)
news_IDMAPS = \
../refman-common/metadata/connector-odbc.idmap \
- ../refman-common/metadata/news-connector-net.idmap \
metadata/apis-c.idmap \
metadata/client-utility-programs.idmap \
metadata/data-types.idmap \
Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/apis-c.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 4, Lines Added: 11, Lines Deleted: 11; 2794 bytes
@@ -5689,9 +5689,9 @@
<literal>mysql_query()</literal> cannot be used for statements
that contain binary data; you must use
<literal>mysql_real_query()</literal> instead. (Binary data may
- contain the <quote><literal>\0</literal></quote> character, which
- <literal>mysql_query()</literal> interprets as the end of the
- statement string.)
+ contain the <quote><literal>\0</literal></quote> character,
+ which <literal>mysql_query()</literal> interprets as the end of
+ the statement string.)
</para>
<para>
@@ -5956,9 +5956,9 @@
<entry><literal>CLIENT_MULTI_STATEMENTS</literal></entry>
<entry>Tell the server that the client may send multiple statements in a single
string (separated by
- <quote><literal>;</literal></quote>). If this flag is
- not set, multiple-statement execution is disabled.
- See the note following this table for more
+ <quote><literal>;</literal></quote>). If this flag
+ is not set, multiple-statement execution is
+ disabled. See the note following this table for more
information about this flag.</entry>
</row>
<row>
@@ -6409,9 +6409,9 @@
<literal>mysql_query()</literal> cannot be used for statements
that contain binary data; you must use
<literal>mysql_real_query()</literal> instead. (Binary data may
- contain the <quote><literal>\0</literal></quote> character, which
- <literal>mysql_query()</literal> interprets as the end of the
- statement string.) In addition,
+ contain the <quote><literal>\0</literal></quote> character,
+ which <literal>mysql_query()</literal> interprets as the end of
+ the statement string.) In addition,
<literal>mysql_real_query()</literal> is faster than
<literal>mysql_query()</literal> because it does not call
<literal>strlen()</literal> on the statement string.
@@ -11556,8 +11556,8 @@
a status value. The string length should be given by the
<literal>length</literal> argument. The string must consist of a
single SQL statement. You should not add a terminating semicolon
- (<quote><literal>;</literal></quote>) or <literal>\g</literal> to
- the statement.
+ (<quote><literal>;</literal></quote>) or <literal>\g</literal>
+ to the statement.
</para>
<para>
Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/charset.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 13; 3426 bytes
@@ -135,10 +135,11 @@
<para>
Suppose that we want to compare two string values,
<quote><literal>A</literal></quote> and
- <quote><literal>B</literal></quote>. The simplest way to do this is
- to look at the encodings: 0 for <quote><literal>A</literal></quote>
- and 1 for <quote><literal>B</literal></quote>. Because 0 is less
- than 1, we say <quote><literal>A</literal></quote> is less than
+ <quote><literal>B</literal></quote>. The simplest way to do this
+ is to look at the encodings: 0 for
+ <quote><literal>A</literal></quote> and 1 for
+ <quote><literal>B</literal></quote>. Because 0 is less than 1, we
+ say <quote><literal>A</literal></quote> is less than
<quote><literal>B</literal></quote>. What we've just done is apply
a collation to our character set. The collation is a set of rules
(only one rule in this case): <quote>compare the
@@ -149,8 +150,8 @@
<para>
But what if we want to say that the lowercase and uppercase
letters are equivalent? Then we would have at least two rules: (1)
- treat the lowercase letters <quote><literal>a</literal></quote> and
- <quote><literal>b</literal></quote> as equivalent to
+ treat the lowercase letters <quote><literal>a</literal></quote>
+ and <quote><literal>b</literal></quote> as equivalent to
<quote><literal>A</literal></quote> and
<quote><literal>B</literal></quote>; (2) then compare the
encodings. We call this a <firstterm>case-insensitive</firstterm>
@@ -968,8 +969,8 @@
<literal>05</literal> and <literal>5C</literal>) is a valid
multi-byte character. Hence, the first two bytes of the string
are interpreted as a single <literal>sjis</literal> character,
- and the <quote><literal>\</literal></quote> is not intrepreted as
- an escape character. The following
+ and the <quote><literal>\</literal></quote> is not intrepreted
+ as an escape character. The following
<quote><literal>n</literal></quote> (hex value
<literal>6E</literal>) is not interpreted as part of an escape
sequence. This is true even for the second string; the
@@ -3548,12 +3549,12 @@
modern Spanish and traditional Spanish, respectively. In both
collations, <quote><literal>ñ</literal></quote> (n-tilde) is a
separate letter between <quote><literal>n</literal></quote> and
- <quote><literal>o</literal></quote>. In addition, for traditional
- Spanish, <quote><literal>ch</literal></quote> is a separate
- letter between <quote><literal>c</literal></quote> and
+ <quote><literal>o</literal></quote>. In addition, for
+ traditional Spanish, <quote><literal>ch</literal></quote> is a
+ separate letter between <quote><literal>c</literal></quote> and
<quote><literal>d</literal></quote>, and
- <quote><literal>ll</literal></quote> is a separate letter between
- <quote><literal>l</literal></quote> and
+ <quote><literal>ll</literal></quote> is a separate letter
+ between <quote><literal>l</literal></quote> and
<quote><literal>m</literal></quote>
</para>
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/client-utility-programs.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 11; 2549 bytes
@@ -2523,8 +2523,8 @@
round-robin fashion for creating temporary files. The
separator character between directory names is the colon
(<quote><literal>:</literal></quote>) on Unix and the
- semicolon (<quote><literal>;</literal></quote>) on Windows,
- NetWare, and OS/2.
+ semicolon (<quote><literal>;</literal></quote>) on
+ Windows, NetWare, and OS/2.
</para>
</listitem>
@@ -13993,21 +13993,21 @@
(<quote><literal>*</literal></quote>,
<quote><literal>?</literal></quote>,
<quote><literal>%</literal></quote>, or
- <quote><literal>_</literal></quote>), only those names that are
- matched by the wildcard are shown. If a database name contains
- any underscores, those should be escaped with a backslash
- (some Unix shells require two) to get a list of the proper
- tables or columns. <quote><literal>*</literal></quote> and
- <quote><literal>?</literal></quote> characters are converted
- into SQL <quote><literal>%</literal></quote> and
+ <quote><literal>_</literal></quote>), only those names that
+ are matched by the wildcard are shown. If a database name
+ contains any underscores, those should be escaped with a
+ backslash (some Unix shells require two) to get a list of the
+ proper tables or columns. <quote><literal>*</literal></quote>
+ and <quote><literal>?</literal></quote> characters are
+ converted into SQL <quote><literal>%</literal></quote> and
<quote><literal>_</literal></quote> wildcard characters. This
might cause some confusion when you try to display the columns
for a table with a <quote><literal>_</literal></quote> in the
name, because in this case, <command>mysqlshow</command> shows
you only the table names that match the pattern. This is
easily fixed by adding an extra
- <quote><literal>%</literal></quote> last on the command line as
- a separate argument.
+ <quote><literal>%</literal></quote> last on the command line
+ as a separate argument.
</para>
<para>
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/data-types.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1034 bytes
@@ -3139,9 +3139,9 @@
The relaxed format allowed for values specified as strings
can be deceiving. For example, a value such as
<literal>'10:11:12'</literal> might look like a time value
- because of the <quote><literal>:</literal></quote> delimiter,
- but if used in a date context is interpreted as the year
- <literal>'2010-11-12'</literal>. The value
+ because of the <quote><literal>:</literal></quote>
+ delimiter, but if used in a date context is interpreted as
+ the year <literal>'2010-11-12'</literal>. The value
<literal>'10:45:15'</literal> is converted to
<literal>'0000-00-00'</literal> because
<literal>'45'</literal> is not a legal month.
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/dba-core.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 12, Lines Deleted: 7; 1509 bytes
@@ -10063,14 +10063,19 @@
database system. A simple description of this mode is
<quote>give an error instead of a warning</quote> when
inserting an incorrect value into a column.
- <emphasis role="bold">Note</emphasis>: The
- <literal>INSERT</literal>/<literal>UPDATE</literal> aborts
- as soon as the error is noticed. This may not be what you
- want if you are using a non-transactional storage engine,
- because data changes made prior to the error may not be
- rolled back, resulting in a <quote>partially done</quote>
- update. (Added in MySQL 5.0.2)
</para>
+
+ <note>
+ <para>
+ The <literal>INSERT</literal>/<literal>UPDATE</literal>
+ aborts as soon as the error is noticed. This may not be
+ what you want if you are using a non-transactional
+ storage engine, because data changes made prior to the
+ error may not be rolled back, resulting in a
+ <quote>partially done</quote> update. (Added in MySQL
+ 5.0.2)
+ </para>
+ </note>
</listitem>
</itemizedlist>
Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/errors-problems.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 4; 1124 bytes
@@ -3313,12 +3313,16 @@
characters (<quote><literal>:</literal></quote>) on Unix and
semicolon characters (<quote><literal>;</literal></quote>) on
Windows, NetWare, and OS/2.
- <emphasis role="bold">Note</emphasis>: To spread the load
- effectively, these paths should be located on different
- <emphasis>physical</emphasis> disks, not different partitions
- of the same disk.
</para>
+ <note>
+ <para>
+ To spread the load effectively, these paths should be
+ located on different <emphasis>physical</emphasis> disks,
+ not different partitions of the same disk.
+ </para>
+ </note>
+
<para>
If the MySQL server is acting as a replication slave, you
should not set <option>--tmpdir</option> to point to a
Modified: trunk/refman-5.0/faqs.xml
===================================================================
--- trunk/refman-5.0/faqs.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/faqs.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 9; 1864 bytes
@@ -4509,17 +4509,22 @@
extensions. (See <xref linkend="spatial-extensions"/>.) In
addition, there are some differences with regard to indexes
when used with <literal>NDB</literal> tables.
- <emphasis role="bold">Note</emphasis>: MySQL Cluster tables
- (that is, tables created with
- <literal>ENGINE=NDBCLUSTER</literal>) have only fixed-width
- rows. This means that (for example) each record containing a
- <literal>VARCHAR(255)</literal> column will require space
- for 255 characters (as required for the character set and
- collation being used for the table), regardless of the
- actual number of characters stored therein. This issue is
- expected to be fixed in a future MySQL release series.
</para>
+ <note>
+ <para>
+ MySQL Cluster tables (that is, tables created with
+ <literal>ENGINE=NDBCLUSTER</literal>) have only
+ fixed-width rows. This means that (for example) each
+ record containing a <literal>VARCHAR(255)</literal> column
+ will require space for 255 characters (as required for the
+ character set and collation being used for the table),
+ regardless of the actual number of characters stored
+ therein. This issue is expected to be fixed in a future
+ MySQL release series.
+ </para>
+ </note>
+
<para>
See <xref linkend="mysql-cluster-limitations"/>, for more
information about these issues.
Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/functions-core.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 8; 1814 bytes
@@ -16,7 +16,7 @@
with respect to case sensitivity. Specifically, they still carry the
4.0 connotation of binary string meaning a "case sensitive" string,
instead of the 4.1 meaning of "string of bytes without character set
- or collation." Search for "sensitive to find these.
+ or collation." Search for "sensitive to find these".
</remark>
<indexterm>
@@ -12268,14 +12268,19 @@
<para>
Then recompile MySQL. There is no need to rebuild the
- indexes in this case. <emphasis role="bold">Note</emphasis>:
- By making this change, you <emphasis>severely</emphasis>
- decrease MySQL's ability to provide adequate relevance
- values for the <literal>MATCH()</literal> function. If you
- really need to search for such common words, it would be
- better to search using <literal>IN BOOLEAN MODE</literal>
- instead, which does not observe the 50% threshold.
+ indexes in this case.
</para>
+
+ <note>
+ <para>
+ By making this change, you <emphasis>severely</emphasis>
+ decrease MySQL's ability to provide adequate relevance
+ values for the <literal>MATCH()</literal> function. If you
+ really need to search for such common words, it would be
+ better to search using <literal>IN BOOLEAN MODE</literal>
+ instead, which does not observe the 50% threshold.
+ </para>
+ </note>
</listitem>
<listitem>
Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/introduction.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 6; 1400 bytes
@@ -2334,12 +2334,12 @@
start-comment sequence. MySQL Server uses
<quote><literal>#</literal></quote> as the start comment
character. MySQL Server 3.23.3 and up also supports a variant
- of the <quote><literal>--</literal></quote> comment style. That
- is, the <quote><literal>--</literal></quote> start-comment
- sequence must be followed by a space (or by a control
- character such as a newline). The space is required to prevent
- problems with automatically generated SQL queries that use
- constructs such as the following, where we automatically
+ of the <quote><literal>--</literal></quote> comment style.
+ That is, the <quote><literal>--</literal></quote>
+ start-comment sequence must be followed by a space (or by a
+ control character such as a newline). The space is required to
+ prevent problems with automatically generated SQL queries that
+ use constructs such as the following, where we automatically
insert the value of the payment for
<literal>payment</literal>:
</para>
Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/language-structure.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 4, Lines Added: 15, Lines Deleted: 13; 2748 bytes
@@ -346,10 +346,10 @@
<para>
The ASCII 26 character can be encoded as
- <quote><literal>\Z</literal></quote> to enable you to work around
- the problem that ASCII 26 stands for END-OF-FILE on Windows.
- ASCII 26 within a file causes problems if you try to use
- <literal>mysql <replaceable>db_name</replaceable> <
+ <quote><literal>\Z</literal></quote> to enable you to work
+ around the problem that ASCII 26 stands for END-OF-FILE on
+ Windows. ASCII 26 within a file causes problems if you try to
+ use <literal>mysql <replaceable>db_name</replaceable> <
<replaceable>file_name</replaceable></literal>.
</para>
@@ -363,8 +363,9 @@
<para>
The <quote><literal>\%</literal></quote> and
- <quote><literal>\_</literal></quote> sequences are used to search
- for literal instances of <quote><literal>%</literal></quote> and
+ <quote><literal>\_</literal></quote> sequences are used to
+ search for literal instances of
+ <quote><literal>%</literal></quote> and
<quote><literal>_</literal></quote> in pattern-matching contexts
where they would otherwise be interpreted as wildcard
characters. See the description of the <literal>LIKE</literal>
@@ -926,17 +927,18 @@
Database names cannot contain
<quote><literal>/</literal></quote>,
<quote><literal>\</literal></quote>,
- <quote><literal>.</literal></quote>, or characters that are not
- allowed in a directory name.
+ <quote><literal>.</literal></quote>, or characters that are
+ not allowed in a directory name.
</para>
</listitem>
<listitem>
<para>
- Table names cannot contain <quote><literal>/</literal></quote>,
+ Table names cannot contain
+ <quote><literal>/</literal></quote>,
<quote><literal>\</literal></quote>,
- <quote><literal>.</literal></quote>, or characters that are not
- allowed in a filename.
+ <quote><literal>.</literal></quote>, or characters that are
+ not allowed in a filename.
</para>
</listitem>
@@ -2237,8 +2239,8 @@
<listitem>
<para>
- From a <quote><literal>#</literal></quote> character to the end
- of the line.
+ From a <quote><literal>#</literal></quote> character to the
+ end of the line.
</para>
</listitem>
Modified: trunk/refman-5.0/replication-notes.xml
===================================================================
--- trunk/refman-5.0/replication-notes.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/replication-notes.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 7; 840 bytes
@@ -600,13 +600,13 @@
<xref linkend="binary-log"/>.
</para>
- <para>
- <emphasis
- role="bold">Note</emphasis>:
- <option>--innodb-safe-binlog</option> is unneeded as of MySQL
- 5.0.3, having been made obsolete by the introduction of XA
- transaction support.
- </para>
+ <note>
+ <para>
+ <option>--innodb-safe-binlog</option> is unneeded as of MySQL
+ 5.0.3, having been made obsolete by the introduction of XA
+ transaction support.
+ </para>
+ </note>
</section>
Modified: trunk/refman-5.0/se-myisam.xml
===================================================================
--- trunk/refman-5.0/se-myisam.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/se-myisam.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 4, Lines Added: 15, Lines Deleted: 10; 1620 bytes
@@ -397,9 +397,13 @@
<para>
The size of the tree cache used in bulk insert optimization.
- <emphasis role="bold">Note</emphasis>: This is a limit
- <emphasis>per thread</emphasis>!
</para>
+
+ <note>
+ <para>
+ This is a limit <emphasis>per thread</emphasis>!
+ </para>
+ </note>
</listitem>
<listitem>
@@ -410,9 +414,14 @@
<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 parameter was
- given in bytes before MySQL 5.0.6, when it was removed.
</para>
+
+ <note>
+ <para>
+ This parameter was given in bytes before MySQL 5.0.6, when
+ it was removed.
+ </para>
+ </note>
</listitem>
<listitem>
@@ -944,10 +953,7 @@
</itemizedlist>
- <formalpara>
-
- <title>Note</title>
-
+ <note>
<para>
While a compressed table is read-only, and you cannot
therefore update or add rows in the table, DDL (Data
@@ -955,9 +961,8 @@
you may still use <literal>DROP</literal> to drop the table,
and <literal>TRUNCATE</literal> to empty the table.
</para>
+ </note>
- </formalpara>
-
</section>
</section>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/sql-syntax.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 7; 1486 bytes
@@ -10877,11 +10877,11 @@
<para>
<replaceable>col_name</replaceable> can be a column name, or a
- string containing the SQL <quote><literal>%</literal></quote> and
- <quote><literal>_</literal></quote> wildcard characters to obtain
- output only for the columns with names matching the string.
- There is no need to enclose the string within quotes unless it
- contains spaces or other special characters.
+ string containing the SQL <quote><literal>%</literal></quote>
+ and <quote><literal>_</literal></quote> wildcard characters to
+ obtain output only for the columns with names matching the
+ string. There is no need to enclose the string within quotes
+ unless it contains spaces or other special characters.
</para>
<programlisting>
@@ -18301,8 +18301,8 @@
<para>
How the column is sorted in the index. In MySQL, this can
- have values <quote><literal>A</literal></quote> (Ascending)
- or <literal>NULL</literal> (Not sorted).
+ have values <quote><literal>A</literal></quote>
+ (Ascending) or <literal>NULL</literal> (Not sorted).
</para>
</listitem>
Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.0/tutorial.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 9, Lines Added: 28, Lines Deleted: 19; 4654 bytes
@@ -501,8 +501,8 @@
The <literal>'></literal> and <literal>"></literal> prompts
occur during string collection (another way of saying that MySQL
is waiting for completion of a string). In MySQL, you can write
- strings surrounded by either <quote><literal>'</literal></quote> or
- <quote><literal>"</literal></quote> characters (for example,
+ strings surrounded by either <quote><literal>'</literal></quote>
+ or <quote><literal>"</literal></quote> characters (for example,
<literal>'hello'</literal> or <literal>"goodbye"</literal>), and
<command>mysql</command> lets you enter strings that span multiple
lines. When you see a <literal>'></literal> or
@@ -909,12 +909,17 @@
all be the same, and need not be <literal>20</literal>. You can
normally pick any length from <literal>1</literal> to
<literal>65535</literal>, whatever seems most reasonable to you.
- (<emphasis role="bold">Note</emphasis>: Prior to MySQL 5.0.3,
- the upper limit was 255.) If you make a poor choice and it turns
- out later that you need a longer field, MySQL provides an
- <literal>ALTER TABLE</literal> statement.
</para>
+ <note>
+ <para>
+ Prior to MySQL 5.0.3, the upper limit was 255.) If you make a
+ poor choice and it turns out later that you need a longer
+ field, MySQL provides an <literal>ALTER TABLE</literal>
+ statement.
+ </para>
+ </note>
+
<para>
Several types of values can be chosen to represent sex in animal
records, such as <literal>'m'</literal> and
@@ -2083,7 +2088,8 @@
</programlisting>
<para>
- To find names ending with <quote><literal>fy</literal></quote>:
+ To find names ending with
+ <quote><literal>fy</literal></quote>:
</para>
<programlisting>
@@ -2097,7 +2103,8 @@
</programlisting>
<para>
- To find names containing a <quote><literal>w</literal></quote>:
+ To find names containing a
+ <quote><literal>w</literal></quote>:
</para>
<programlisting>
@@ -2158,9 +2165,9 @@
<quote><literal>b</literal></quote>, or
<quote><literal>c</literal></quote>. To name a range of
characters, use a dash.
- <quote><literal>[a-z]</literal></quote> matches any letter,
- whereas <quote><literal>[0-9]</literal></quote> matches any
- digit.
+ <quote><literal>[a-z]</literal></quote> matches any
+ letter, whereas <quote><literal>[0-9]</literal></quote>
+ matches any digit.
</para>
</listitem>
@@ -2170,9 +2177,9 @@
instances of the thing preceding it. For example,
<quote><literal>x*</literal></quote> matches any number of
<quote><literal>x</literal></quote> characters,
- <quote><literal>[0-9]*</literal></quote> matches any number
- of digits, and <quote><literal>.*</literal></quote> matches
- any number of anything.
+ <quote><literal>[0-9]*</literal></quote> matches any
+ number of digits, and <quote><literal>.*</literal></quote>
+ matches any number of anything.
</para>
</listitem>
@@ -2226,7 +2233,8 @@
comparison to be case sensitive, use the
<literal>BINARY</literal> keyword to make one of the strings a
binary string. This query matches only lowercase
- <quote><literal>b</literal></quote> at the beginning of a name:
+ <quote><literal>b</literal></quote> at the beginning of a
+ name:
</para>
<programlisting>
@@ -2234,8 +2242,9 @@
</programlisting>
<para>
- To find names ending with <quote><literal>fy</literal></quote>,
- use <quote><literal>$</literal></quote> to match the end of the
+ To find names ending with
+ <quote><literal>fy</literal></quote>, use
+ <quote><literal>$</literal></quote> to match the end of the
name:
</para>
@@ -2250,8 +2259,8 @@
</programlisting>
<para>
- To find names containing a <quote><literal>w</literal></quote>,
- use this query:
+ To find names containing a
+ <quote><literal>w</literal></quote>, use this query:
</para>
<programlisting>
Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/Makefile.depends 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 5; 1685 bytes
@@ -382,9 +382,9 @@
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/information-sources.idmap \
../refman-common/metadata/news-cj-core.idmap \
+ ../refman-common/metadata/news-cmxj-core.idmap \
+ ../refman-common/metadata/news-cnet-core.idmap \
../refman-common/metadata/news-codbc-core.idmap \
- ../refman-common/metadata/news-connector-mxj.idmap \
- ../refman-common/metadata/news-connector-net.idmap \
metadata/apis-c.idmap \
metadata/apis-php.idmap \
metadata/apis.idmap \
@@ -564,7 +564,7 @@
dynxml_common_news_vstudioplugin_IMAGES =
dynxml_common_news_vstudioplugin_SOURCES = dynxml-common-news-vstudioplugin.xml $(dynxml_common_news_vstudioplugin_INCLUDES)
dynxml_common_news_vstudioplugin_IDMAPS = \
- ../refman-common/metadata/news-connector-net.idmap
+ ../refman-common/metadata/news-cnet-core.idmap
dynxml-common-news-vstudioplugin.validpure: $(dynxml_common_news_vstudioplugin_SOURCES)
dynxml-common-news-vstudioplugin.titles: $(dynxml_common_news_vstudioplugin_SOURCES)
dynxml-common-news-vstudioplugin.useless: $(dynxml_common_news_vstudioplugin_SOURCES)
@@ -1311,8 +1311,6 @@
../ndbapi/metadata/ndb-internals.idmap \
../ndbapi/metadata/ndbapi.idmap \
../refman-common/metadata/gpl-license.idmap \
- ../refman-common/metadata/news-connector-mxj.idmap \
- ../refman-common/metadata/news-connector-net.idmap \
metadata/apis-c.idmap \
metadata/apis-libmysqld.idmap \
metadata/apis-perl.idmap \
Modified: trunk/refman-5.1/apis-c.xml
===================================================================
--- trunk/refman-5.1/apis-c.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/apis-c.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 6, Lines Added: 18, Lines Deleted: 18; 4009 bytes
@@ -3992,9 +3992,9 @@
<listitem>
<para>
- If there is an auto-increment column, and an
- automatically generated value was successfully inserted,
- return the first such value.
+ If there is an auto-increment column, and an automatically
+ generated value was successfully inserted, return the first
+ such value.
</para>
</listitem>
@@ -4002,16 +4002,16 @@
<para>
If
<literal>LAST_INSERT_ID(<replaceable>expr</replaceable>)</literal>
- occurred in the statement, return <literal>expr</literal>, even if
- there was an auto-increment column in the affected table.
+ occurred in the statement, return <literal>expr</literal>,
+ even if there was an auto-increment column in the affected
+ table.
</para>
</listitem>
<listitem>
<para>
The return value varies depending on the statement used.
- When called after an <literal>INSERT</literal>
- statement:
+ When called after an <literal>INSERT</literal> statement:
</para>
<itemizedlist>
@@ -5768,9 +5768,9 @@
<literal>mysql_query()</literal> cannot be used for statements
that contain binary data; you must use
<literal>mysql_real_query()</literal> instead. (Binary data may
- contain the <quote><literal>\0</literal></quote> character, which
- <literal>mysql_query()</literal> interprets as the end of the
- statement string.)
+ contain the <quote><literal>\0</literal></quote> character,
+ which <literal>mysql_query()</literal> interprets as the end of
+ the statement string.)
</para>
<para>
@@ -6035,9 +6035,9 @@
<entry><literal>CLIENT_MULTI_STATEMENTS</literal></entry>
<entry>Tell the server that the client may send multiple statements in a single
string (separated by
- <quote><literal>;</literal></quote>). If this flag is
- not set, multiple-statement execution is disabled.
- See the note following this table for more
+ <quote><literal>;</literal></quote>). If this flag
+ is not set, multiple-statement execution is
+ disabled. See the note following this table for more
information about this flag.</entry>
</row>
<row>
@@ -6488,9 +6488,9 @@
<literal>mysql_query()</literal> cannot be used for statements
that contain binary data; you must use
<literal>mysql_real_query()</literal> instead. (Binary data may
- contain the <quote><literal>\0</literal></quote> character, which
- <literal>mysql_query()</literal> interprets as the end of the
- statement string.) In addition,
+ contain the <quote><literal>\0</literal></quote> character,
+ which <literal>mysql_query()</literal> interprets as the end of
+ the statement string.) In addition,
<literal>mysql_real_query()</literal> is faster than
<literal>mysql_query()</literal> because it does not call
<literal>strlen()</literal> on the statement string.
@@ -11661,8 +11661,8 @@
a status value. The string length should be given by the
<literal>length</literal> argument. The string must consist of a
single SQL statement. You should not add a terminating semicolon
- (<quote><literal>;</literal></quote>) or <literal>\g</literal> to
- the statement.
+ (<quote><literal>;</literal></quote>) or <literal>\g</literal>
+ to the statement.
</para>
<para>
Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/charset.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 13; 3426 bytes
@@ -135,10 +135,11 @@
<para>
Suppose that we want to compare two string values,
<quote><literal>A</literal></quote> and
- <quote><literal>B</literal></quote>. The simplest way to do this is
- to look at the encodings: 0 for <quote><literal>A</literal></quote>
- and 1 for <quote><literal>B</literal></quote>. Because 0 is less
- than 1, we say <quote><literal>A</literal></quote> is less than
+ <quote><literal>B</literal></quote>. The simplest way to do this
+ is to look at the encodings: 0 for
+ <quote><literal>A</literal></quote> and 1 for
+ <quote><literal>B</literal></quote>. Because 0 is less than 1, we
+ say <quote><literal>A</literal></quote> is less than
<quote><literal>B</literal></quote>. What we've just done is apply
a collation to our character set. The collation is a set of rules
(only one rule in this case): <quote>compare the
@@ -149,8 +150,8 @@
<para>
But what if we want to say that the lowercase and uppercase
letters are equivalent? Then we would have at least two rules: (1)
- treat the lowercase letters <quote><literal>a</literal></quote> and
- <quote><literal>b</literal></quote> as equivalent to
+ treat the lowercase letters <quote><literal>a</literal></quote>
+ and <quote><literal>b</literal></quote> as equivalent to
<quote><literal>A</literal></quote> and
<quote><literal>B</literal></quote>; (2) then compare the
encodings. We call this a <firstterm>case-insensitive</firstterm>
@@ -968,8 +969,8 @@
<literal>05</literal> and <literal>5C</literal>) is a valid
multi-byte character. Hence, the first two bytes of the string
are interpreted as a single <literal>sjis</literal> character,
- and the <quote><literal>\</literal></quote> is not intrepreted as
- an escape character. The following
+ and the <quote><literal>\</literal></quote> is not intrepreted
+ as an escape character. The following
<quote><literal>n</literal></quote> (hex value
<literal>6E</literal>) is not interpreted as part of an escape
sequence. This is true even for the second string; the
@@ -3545,12 +3546,12 @@
modern Spanish and traditional Spanish, respectively. In both
collations, <quote><literal>ñ</literal></quote> (n-tilde) is a
separate letter between <quote><literal>n</literal></quote> and
- <quote><literal>o</literal></quote>. In addition, for traditional
- Spanish, <quote><literal>ch</literal></quote> is a separate
- letter between <quote><literal>c</literal></quote> and
+ <quote><literal>o</literal></quote>. In addition, for
+ traditional Spanish, <quote><literal>ch</literal></quote> is a
+ separate letter between <quote><literal>c</literal></quote> and
<quote><literal>d</literal></quote>, and
- <quote><literal>ll</literal></quote> is a separate letter between
- <quote><literal>l</literal></quote> and
+ <quote><literal>ll</literal></quote> is a separate letter
+ between <quote><literal>l</literal></quote> and
<quote><literal>m</literal></quote>
</para>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/client-utility-programs.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 11; 2549 bytes
@@ -2524,8 +2524,8 @@
round-robin fashion for creating temporary files. The
separator character between directory names is the colon
(<quote><literal>:</literal></quote>) on Unix and the
- semicolon (<quote><literal>;</literal></quote>) on Windows,
- NetWare, and OS/2.
+ semicolon (<quote><literal>;</literal></quote>) on
+ Windows, NetWare, and OS/2.
</para>
</listitem>
@@ -14404,21 +14404,21 @@
(<quote><literal>*</literal></quote>,
<quote><literal>?</literal></quote>,
<quote><literal>%</literal></quote>, or
- <quote><literal>_</literal></quote>), only those names that are
- matched by the wildcard are shown. If a database name contains
- any underscores, those should be escaped with a backslash
- (some Unix shells require two) to get a list of the proper
- tables or columns. <quote><literal>*</literal></quote> and
- <quote><literal>?</literal></quote> characters are converted
- into SQL <quote><literal>%</literal></quote> and
+ <quote><literal>_</literal></quote>), only those names that
+ are matched by the wildcard are shown. If a database name
+ contains any underscores, those should be escaped with a
+ backslash (some Unix shells require two) to get a list of the
+ proper tables or columns. <quote><literal>*</literal></quote>
+ and <quote><literal>?</literal></quote> characters are
+ converted into SQL <quote><literal>%</literal></quote> and
<quote><literal>_</literal></quote> wildcard characters. This
might cause some confusion when you try to display the columns
for a table with a <quote><literal>_</literal></quote> in the
name, because in this case, <command>mysqlshow</command> shows
you only the table names that match the pattern. This is
easily fixed by adding an extra
- <quote><literal>%</literal></quote> last on the command line as
- a separate argument.
+ <quote><literal>%</literal></quote> last on the command line
+ as a separate argument.
</para>
<para>
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/data-types.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1034 bytes
@@ -2980,9 +2980,9 @@
The relaxed format allowed for values specified as strings
can be deceiving. For example, a value such as
<literal>'10:11:12'</literal> might look like a time value
- because of the <quote><literal>:</literal></quote> delimiter,
- but if used in a date context is interpreted as the year
- <literal>'2010-11-12'</literal>. The value
+ because of the <quote><literal>:</literal></quote>
+ delimiter, but if used in a date context is interpreted as
+ the year <literal>'2010-11-12'</literal>. The value
<literal>'10:45:15'</literal> is converted to
<literal>'0000-00-00'</literal> because
<literal>'45'</literal> is not a legal month.
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/dba-core.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 5, Lines Added: 23, Lines Deleted: 18; 4043 bytes
@@ -3261,10 +3261,10 @@
that is too small to hold temporary tables. This option
accepts several paths that are used in round-robin
fashion. Paths should be separated by colon characters
- (<quote><literal>:</literal></quote>) on Unix and semicolon
- characters (<quote><literal>;</literal></quote>) on
- Windows, NetWare, and OS/2. If the MySQL server is acting
- as a replication slave, you should not set
+ (<quote><literal>:</literal></quote>) on Unix and
+ semicolon characters (<quote><literal>;</literal></quote>)
+ on Windows, NetWare, and OS/2. If the MySQL server is
+ acting as a replication slave, you should not set
<option>--tmpdir</option> to point to a directory on a
memory-based filesystem or to a directory that is cleared
when the server host restarts. For more information about
@@ -7709,9 +7709,9 @@
tables. This variable can be set to a list of several
paths that are used in round-robin fashion. Paths should
be separated by colon characters
- (<quote><literal>:</literal></quote>) on Unix and semicolon
- characters (<quote><literal>;</literal></quote>) on
- Windows, NetWare, and OS/2.
+ (<quote><literal>:</literal></quote>) on Unix and
+ semicolon characters (<quote><literal>;</literal></quote>)
+ on Windows, NetWare, and OS/2.
</para>
<para>
@@ -10480,14 +10480,18 @@
database system. A simple description of this mode is
<quote>give an error instead of a warning</quote> when
inserting an incorrect value into a column.
- <emphasis role="bold">Note</emphasis>: The
- <literal>INSERT</literal>/<literal>UPDATE</literal> aborts
- as soon as the error is noticed. This may not be what you
- want if you are using a non-transactional storage engine,
- because data changes made prior to the error may not be
- rolled back, resulting in a <quote>partially done</quote>
- update.
</para>
+
+ <note>
+ <para>
+ The <literal>INSERT</literal>/<literal>UPDATE</literal>
+ aborts as soon as the error is noticed. This may not be
+ what you want if you are using a non-transactional
+ storage engine, because data changes made prior to the
+ error may not be rolled back, resulting in a
+ <quote>partially done</quote> update.
+ </para>
+ </note>
</listitem>
</itemizedlist>
@@ -20494,8 +20498,8 @@
<literal>LIKE</literal> operator. If you want to use either
character literally when granting privileges, you must
escape it with a backslash. For example, to include the
- underscore character (<quote><literal>_</literal></quote>) as
- part of a database name, specify it as
+ underscore character (<quote><literal>_</literal></quote>)
+ as part of a database name, specify it as
<quote><literal>\_</literal></quote> in the
<literal>GRANT</literal> statement.
</para>
@@ -27315,8 +27319,9 @@
<listitem>
<para>
- Comments start with a <quote><literal>#</literal></quote>
- character and continue to the end of the line.
+ Comments start with a
+ <quote><literal>#</literal></quote> character and
+ continue to the end of the line.
</para>
</listitem>
Modified: trunk/refman-5.1/errors-problems.xml
===================================================================
--- trunk/refman-5.1/errors-problems.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/errors-problems.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 4; 1124 bytes
@@ -3314,12 +3314,16 @@
characters (<quote><literal>:</literal></quote>) on Unix and
semicolon characters (<quote><literal>;</literal></quote>) on
Windows, NetWare, and OS/2.
- <emphasis role="bold">Note</emphasis>: To spread the load
- effectively, these paths should be located on different
- <emphasis>physical</emphasis> disks, not different partitions
- of the same disk.
</para>
+ <note>
+ <para>
+ To spread the load effectively, these paths should be
+ located on different <emphasis>physical</emphasis> disks,
+ not different partitions of the same disk.
+ </para>
+ </note>
+
<para>
If the MySQL server is acting as a replication slave, you
should not set <option>--tmpdir</option> to point to a
Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/extending-mysql.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 3, Lines Added: 25, Lines Deleted: 12; 2744 bytes
@@ -2817,12 +2817,16 @@
the function. The file must be located in the plugin directory.
This directory is given by the value of the
<literal>plugin_dir</literal> system variable.
- (<emphasis role="bold">Note</emphasis>: This a change in MySQL
- 5.1. For earlier versions of MySQL, the shared object can be
- located in any directory that is searched by your system's
- dynamic linker.)
</para>
+ <note>
+ <para>
+ This a change in MySQL 5.1. For earlier versions of MySQL, the
+ shared object can be located in any directory that is searched
+ by your system's dynamic linker.)
+ </para>
+ </note>
+
<para>
To create a function, you must have the
<literal>INSERT</literal> and privilege for the
@@ -4127,12 +4131,17 @@
server's plugin directory and name it
<filename>udf_example.so</filename>. This directory is given
by the value of the <literal>plugin_dir</literal> system
- variable. (<emphasis role="bold">Note</emphasis>: This a
- change in MySQL 5.1. For earlier versions of MySQL, the shared
- object can be located in any directory that is searched by
- your system's dynamic linker.)
+ variable.
</para>
+ <note>
+ <para>
+ This a change in MySQL 5.1. For earlier versions of MySQL,
+ the shared object can be located in any directory that is
+ searched by your system's dynamic linker.)
+ </para>
+ </note>
+
<para>
On some systems, the <command>ldconfig</command> program that
configures the dynamic linker does not recognize a shared
@@ -4338,12 +4347,16 @@
They must be located in the server's plugin directory. This
directory is given by the value of the
<literal>plugin_dir</literal> system variable.
- (<emphasis role="bold">Note</emphasis>: This a change in MySQL
- 5.1. For earlier versions of MySQL, the shared object can be
- located in any directory that is searched by your system's
- dynamic linker.)
</para>
+ <note>
+ <para>
+ This a change in MySQL 5.1. For earlier versions of MySQL,
+ the shared object can be located in any directory that is
+ searched by your system's dynamic linker.)
+ </para>
+ </note>
+
</section>
</section>
Modified: trunk/refman-5.1/faqs.xml
===================================================================
--- trunk/refman-5.1/faqs.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/faqs.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 9; 1826 bytes
@@ -4545,17 +4545,22 @@
extensions. (See <xref linkend="spatial-extensions"/>.) In
addition, there are some differences with regard to indexes
when used with <literal>NDB</literal> tables.
- <emphasis role="bold">Note</emphasis>: MySQL Cluster Disk
- Data tables (that is, tables created with
- <literal>TABLESPACE ... STORAGE DISK
- ENGINE=NDBCLUSTER</literal>) have only fixed-width rows.
- This means that (for example) each Disk Data table record
- containing a <literal>VARCHAR(255)</literal> column requires
- space for 255 characters (as required for the character set
- and collation being used for the table), regardless of the
- actual number of characters stored therein.
</para>
+ <note>
+ <para>
+ MySQL Cluster Disk Data tables (that is, tables created
+ with <literal>TABLESPACE ... STORAGE DISK
+ ENGINE=NDBCLUSTER</literal>) have only fixed-width rows.
+ This means that (for example) each Disk Data table record
+ containing a <literal>VARCHAR(255)</literal> column
+ requires space for 255 characters (as required for the
+ character set and collation being used for the table),
+ regardless of the actual number of characters stored
+ therein.
+ </para>
+ </note>
+
<para>
See <xref linkend="mysql-cluster-limitations"/>, for more
information about these issues.
Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/functions-core.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 12, Lines Deleted: 7; 1439 bytes
@@ -12248,14 +12248,19 @@
<para>
Then recompile MySQL. There is no need to rebuild the
- indexes in this case. <emphasis role="bold">Note</emphasis>:
- By making this change, you <emphasis>severely</emphasis>
- decrease MySQL's ability to provide adequate relevance
- values for the <literal>MATCH()</literal> function. If you
- really need to search for such common words, it would be
- better to search using <literal>IN BOOLEAN MODE</literal>
- instead, which does not observe the 50% threshold.
+ indexes in this case.
</para>
+
+ <note>
+ <para>
+ By making this change, you <emphasis>severely</emphasis>
+ decrease MySQL's ability to provide adequate relevance
+ values for the <literal>MATCH()</literal> function. If you
+ really need to search for such common words, it would be
+ better to search using <literal>IN BOOLEAN MODE</literal>
+ instead, which does not observe the 50% threshold.
+ </para>
+ </note>
</listitem>
<listitem>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/installing.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 606 bytes
@@ -5443,8 +5443,9 @@
<listitem>
<para>
- <emphasis role="bold">The <quote><literal>\</literal></quote>
- pathname separator character</emphasis>
+ <emphasis role="bold">The
+ <quote><literal>\</literal></quote> pathname separator
+ character</emphasis>
</para>
<para>
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/introduction.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 6; 1400 bytes
@@ -2343,12 +2343,12 @@
start-comment sequence. MySQL Server uses
<quote><literal>#</literal></quote> as the start comment
character. MySQL Server 3.23.3 and up also supports a variant
- of the <quote><literal>--</literal></quote> comment style. That
- is, the <quote><literal>--</literal></quote> start-comment
- sequence must be followed by a space (or by a control
- character such as a newline). The space is required to prevent
- problems with automatically generated SQL queries that use
- constructs such as the following, where we automatically
+ of the <quote><literal>--</literal></quote> comment style.
+ That is, the <quote><literal>--</literal></quote>
+ start-comment sequence must be followed by a space (or by a
+ control character such as a newline). The space is required to
+ prevent problems with automatically generated SQL queries that
+ use constructs such as the following, where we automatically
insert the value of the payment for
<literal>payment</literal>:
</para>
Modified: trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 3, Lines Added: 25, Lines Deleted: 14; 2748 bytes
@@ -2431,12 +2431,13 @@
# purposes such as running ndb_restore)
</programlisting>
- <para>
- (<emphasis role="bold">Note</emphasis>: The
- <literal>world</literal> database can be downloaded from
- <ulink url="&base-url-docs;"/>, where it can be found listed
- under <quote>Examples</quote>.)
- </para>
+ <note>
+ <para>
+ The <literal>world</literal> database can be downloaded from
+ <ulink url="&base-url-docs;"/>, where it can be found listed
+ under <quote>Examples</quote>.
+ </para>
+ </note>
<para>
After all the configuration files have been created and these
@@ -2665,11 +2666,16 @@
have a primary key. If no primary key is defined by the user
when a table is created, the <literal>NDB Cluster</literal>
storage engine automatically generates a hidden one.
- (<emphasis role="bold">Note</emphasis>: This hidden key
- takes up space just as does any other table index. It is not
- uncommon to encounter problems due to insufficient memory
- for accommodating these automatically created indexes.)
</para>
+
+ <note>
+ <para>
+ This hidden key takes up space just as does any other
+ table index. It is not uncommon to encounter problems due
+ to insufficient memory for accommodating these
+ automatically created indexes.
+ </para>
+ </note>
</listitem>
</itemizedlist>
@@ -4058,12 +4064,17 @@
<literal>[MGM]</literal> can be used as an alias; the two
section names are equivalent. All parameters in the following
list are optional and assume their default values if omitted.
- <emphasis role="bold">Note</emphasis>: If neither the
- <literal>ExecuteOnComputer</literal> nor the
- <literal>HostName</literal> parameter is present, the default
- value <literal>localhost</literal> will be assumed for both.
</para>
+ <note>
+ <para>
+ If neither the <literal>ExecuteOnComputer</literal> nor the
+ <literal>HostName</literal> parameter is present, the
+ default value <literal>localhost</literal> will be assumed
+ for both.
+ </para>
+ </note>
+
<itemizedlist>
<listitem>
Modified: trunk/refman-5.1/partitioning-guide.xml
===================================================================
--- trunk/refman-5.1/partitioning-guide.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/partitioning-guide.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 5; 1220 bytes
@@ -2025,13 +2025,17 @@
<para>
The preceding statement would <emphasis>not</emphasis> be
valid, were a different partitioning type to be specified.
- (<emphasis role="bold">Note</emphasis>: In this case, simply
- using <literal>PARTITION BY KEY()</literal> would also be
- valid and have the same effect as <literal>PARTITION BY
- KEY(s1)</literal>, since <literal>s1</literal> is the
- table's primary key.)
</para>
+ <note>
+ <para>
+ In this case, simply using <literal>PARTITION BY
+ KEY()</literal> would also be valid and have the same
+ effect as <literal>PARTITION BY KEY(s1)</literal>, since
+ <literal>s1</literal> is the table's primary key.
+ </para>
+ </note>
+
<para>
For additional information about this issue, see
<xref
Modified: trunk/refman-5.1/se-myisam.xml
===================================================================
--- trunk/refman-5.1/se-myisam.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/se-myisam.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 8; 1121 bytes
@@ -390,9 +390,13 @@
<para>
The size of the tree cache used in bulk insert optimization.
- <emphasis role="bold">Note</emphasis>: This is a limit
- <emphasis>per thread</emphasis>!
</para>
+
+ <note>
+ <para>
+ This is a limit <emphasis>per thread</emphasis>!
+ </para>
+ </note>
</listitem>
<listitem>
@@ -920,10 +924,7 @@
</itemizedlist>
- <formalpara>
-
- <title>Note</title>
-
+ <note>
<para>
While a compressed table is read-only, and you cannot
therefore update or add rows in the table, DDL (Data
@@ -931,9 +932,8 @@
you may still use <literal>DROP</literal> to drop the table,
and <literal>TRUNCATE</literal> to empty the table.
</para>
+ </note>
- </formalpara>
-
</section>
</section>
Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.1/tutorial.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 8, Lines Added: 19, Lines Deleted: 15; 3728 bytes
@@ -496,8 +496,8 @@
The <literal>'></literal> and <literal>"></literal> prompts
occur during string collection (another way of saying that MySQL
is waiting for completion of a string). In MySQL, you can write
- strings surrounded by either <quote><literal>'</literal></quote> or
- <quote><literal>"</literal></quote> characters (for example,
+ strings surrounded by either <quote><literal>'</literal></quote>
+ or <quote><literal>"</literal></quote> characters (for example,
<literal>'hello'</literal> or <literal>"goodbye"</literal>), and
<command>mysql</command> lets you enter strings that span multiple
lines. When you see a <literal>'></literal> or
@@ -2077,7 +2077,8 @@
</programlisting>
<para>
- To find names ending with <quote><literal>fy</literal></quote>:
+ To find names ending with
+ <quote><literal>fy</literal></quote>:
</para>
<programlisting>
@@ -2091,7 +2092,8 @@
</programlisting>
<para>
- To find names containing a <quote><literal>w</literal></quote>:
+ To find names containing a
+ <quote><literal>w</literal></quote>:
</para>
<programlisting>
@@ -2152,9 +2154,9 @@
<quote><literal>b</literal></quote>, or
<quote><literal>c</literal></quote>. To name a range of
characters, use a dash.
- <quote><literal>[a-z]</literal></quote> matches any letter,
- whereas <quote><literal>[0-9]</literal></quote> matches any
- digit.
+ <quote><literal>[a-z]</literal></quote> matches any
+ letter, whereas <quote><literal>[0-9]</literal></quote>
+ matches any digit.
</para>
</listitem>
@@ -2164,9 +2166,9 @@
instances of the thing preceding it. For example,
<quote><literal>x*</literal></quote> matches any number of
<quote><literal>x</literal></quote> characters,
- <quote><literal>[0-9]*</literal></quote> matches any number
- of digits, and <quote><literal>.*</literal></quote> matches
- any number of anything.
+ <quote><literal>[0-9]*</literal></quote> matches any
+ number of digits, and <quote><literal>.*</literal></quote>
+ matches any number of anything.
</para>
</listitem>
@@ -2220,7 +2222,8 @@
comparison to be case sensitive, use the
<literal>BINARY</literal> keyword to make one of the strings a
binary string. This query matches only lowercase
- <quote><literal>b</literal></quote> at the beginning of a name:
+ <quote><literal>b</literal></quote> at the beginning of a
+ name:
</para>
<programlisting>
@@ -2228,8 +2231,9 @@
</programlisting>
<para>
- To find names ending with <quote><literal>fy</literal></quote>,
- use <quote><literal>$</literal></quote> to match the end of the
+ To find names ending with
+ <quote><literal>fy</literal></quote>, use
+ <quote><literal>$</literal></quote> to match the end of the
name:
</para>
@@ -2244,8 +2248,8 @@
</programlisting>
<para>
- To find names containing a <quote><literal>w</literal></quote>,
- use this query:
+ To find names containing a
+ <quote><literal>w</literal></quote>, use this query:
</para>
<programlisting>
Modified: trunk/refman-5.2/Makefile.depends
===================================================================
--- trunk/refman-5.2/Makefile.depends 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/Makefile.depends 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 5; 1685 bytes
@@ -382,9 +382,9 @@
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/information-sources.idmap \
../refman-common/metadata/news-cj-core.idmap \
+ ../refman-common/metadata/news-cmxj-core.idmap \
+ ../refman-common/metadata/news-cnet-core.idmap \
../refman-common/metadata/news-codbc-core.idmap \
- ../refman-common/metadata/news-connector-mxj.idmap \
- ../refman-common/metadata/news-connector-net.idmap \
metadata/apis-c.idmap \
metadata/apis-php.idmap \
metadata/apis.idmap \
@@ -564,7 +564,7 @@
dynxml_common_news_vstudioplugin_IMAGES =
dynxml_common_news_vstudioplugin_SOURCES = dynxml-common-news-vstudioplugin.xml $(dynxml_common_news_vstudioplugin_INCLUDES)
dynxml_common_news_vstudioplugin_IDMAPS = \
- ../refman-common/metadata/news-connector-net.idmap
+ ../refman-common/metadata/news-cnet-core.idmap
dynxml-common-news-vstudioplugin.validpure: $(dynxml_common_news_vstudioplugin_SOURCES)
dynxml-common-news-vstudioplugin.titles: $(dynxml_common_news_vstudioplugin_SOURCES)
dynxml-common-news-vstudioplugin.useless: $(dynxml_common_news_vstudioplugin_SOURCES)
@@ -1312,8 +1312,6 @@
../ndbapi/metadata/ndb-internals.idmap \
../ndbapi/metadata/ndbapi.idmap \
../refman-common/metadata/gpl-license.idmap \
- ../refman-common/metadata/news-connector-mxj.idmap \
- ../refman-common/metadata/news-connector-net.idmap \
metadata/apis-c.idmap \
metadata/apis-libmysqld.idmap \
metadata/apis-perl.idmap \
Modified: trunk/refman-5.2/client-utility-programs.xml
===================================================================
--- trunk/refman-5.2/client-utility-programs.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/client-utility-programs.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 11; 2549 bytes
@@ -2524,8 +2524,8 @@
round-robin fashion for creating temporary files. The
separator character between directory names is the colon
(<quote><literal>:</literal></quote>) on Unix and the
- semicolon (<quote><literal>;</literal></quote>) on Windows,
- NetWare, and OS/2.
+ semicolon (<quote><literal>;</literal></quote>) on
+ Windows, NetWare, and OS/2.
</para>
</listitem>
@@ -14330,21 +14330,21 @@
(<quote><literal>*</literal></quote>,
<quote><literal>?</literal></quote>,
<quote><literal>%</literal></quote>, or
- <quote><literal>_</literal></quote>), only those names that are
- matched by the wildcard are shown. If a database name contains
- any underscores, those should be escaped with a backslash
- (some Unix shells require two) to get a list of the proper
- tables or columns. <quote><literal>*</literal></quote> and
- <quote><literal>?</literal></quote> characters are converted
- into SQL <quote><literal>%</literal></quote> and
+ <quote><literal>_</literal></quote>), only those names that
+ are matched by the wildcard are shown. If a database name
+ contains any underscores, those should be escaped with a
+ backslash (some Unix shells require two) to get a list of the
+ proper tables or columns. <quote><literal>*</literal></quote>
+ and <quote><literal>?</literal></quote> characters are
+ converted into SQL <quote><literal>%</literal></quote> and
<quote><literal>_</literal></quote> wildcard characters. This
might cause some confusion when you try to display the columns
for a table with a <quote><literal>_</literal></quote> in the
name, because in this case, <command>mysqlshow</command> shows
you only the table names that match the pattern. This is
easily fixed by adding an extra
- <quote><literal>%</literal></quote> last on the command line as
- a separate argument.
+ <quote><literal>%</literal></quote> last on the command line
+ as a separate argument.
</para>
<para>
Modified: trunk/refman-5.2/data-types.xml
===================================================================
--- trunk/refman-5.2/data-types.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/data-types.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1034 bytes
@@ -2977,9 +2977,9 @@
The relaxed format allowed for values specified as strings
can be deceiving. For example, a value such as
<literal>'10:11:12'</literal> might look like a time value
- because of the <quote><literal>:</literal></quote> delimiter,
- but if used in a date context is interpreted as the year
- <literal>'2010-11-12'</literal>. The value
+ because of the <quote><literal>:</literal></quote>
+ delimiter, but if used in a date context is interpreted as
+ the year <literal>'2010-11-12'</literal>. The value
<literal>'10:45:15'</literal> is converted to
<literal>'0000-00-00'</literal> because
<literal>'45'</literal> is not a legal month.
Modified: trunk/refman-5.2/dba-core.xml
===================================================================
--- trunk/refman-5.2/dba-core.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/dba-core.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 7; 1447 bytes
@@ -10312,14 +10312,18 @@
database system. A simple description of this mode is
<quote>give an error instead of a warning</quote> when
inserting an incorrect value into a column.
- <emphasis role="bold">Note</emphasis>: The
- <literal>INSERT</literal>/<literal>UPDATE</literal> aborts
- as soon as the error is noticed. This may not be what you
- want if you are using a non-transactional storage engine,
- because data changes made prior to the error may not be
- rolled back, resulting in a <quote>partially done</quote>
- update.
</para>
+
+ <note>
+ <para>
+ The <literal>INSERT</literal>/<literal>UPDATE</literal>
+ aborts as soon as the error is noticed. This may not be
+ what you want if you are using a non-transactional
+ storage engine, because data changes made prior to the
+ error may not be rolled back, resulting in a
+ <quote>partially done</quote> update.
+ </para>
+ </note>
</listitem>
</itemizedlist>
Modified: trunk/refman-5.2/errors-problems.xml
===================================================================
--- trunk/refman-5.2/errors-problems.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/errors-problems.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 4; 1124 bytes
@@ -3314,12 +3314,16 @@
characters (<quote><literal>:</literal></quote>) on Unix and
semicolon characters (<quote><literal>;</literal></quote>) on
Windows, NetWare, and OS/2.
- <emphasis role="bold">Note</emphasis>: To spread the load
- effectively, these paths should be located on different
- <emphasis>physical</emphasis> disks, not different partitions
- of the same disk.
</para>
+ <note>
+ <para>
+ To spread the load effectively, these paths should be
+ located on different <emphasis>physical</emphasis> disks,
+ not different partitions of the same disk.
+ </para>
+ </note>
+
<para>
If the MySQL server is acting as a replication slave, you
should not set <option>--tmpdir</option> to point to a
Modified: trunk/refman-5.2/extending-mysql.xml
===================================================================
--- trunk/refman-5.2/extending-mysql.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/extending-mysql.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 4; 1077 bytes
@@ -2817,12 +2817,16 @@
the function. The file must be located in the plugin directory.
This directory is given by the value of the
<literal>plugin_dir</literal> system variable.
- (<emphasis role="bold">Note</emphasis>: This a change in MySQL
- 5.1. For earlier versions of MySQL, the shared object can be
- located in any directory that is searched by your system's
- dynamic linker.)
</para>
+ <note>
+ <para>
+ This a change in MySQL 5.1. For earlier versions of MySQL, the
+ shared object can be located in any directory that is searched
+ by your system's dynamic linker.
+ </para>
+ </note>
+
<para>
To create a function, you must have the
<literal>INSERT</literal> and privilege for the
Modified: trunk/refman-5.2/faqs.xml
===================================================================
--- trunk/refman-5.2/faqs.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/faqs.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 9; 1826 bytes
@@ -4545,17 +4545,22 @@
extensions. (See <xref linkend="spatial-extensions"/>.) In
addition, there are some differences with regard to indexes
when used with <literal>NDB</literal> tables.
- <emphasis role="bold">Note</emphasis>: MySQL Cluster Disk
- Data tables (that is, tables created with
- <literal>TABLESPACE ... STORAGE DISK
- ENGINE=NDBCLUSTER</literal>) have only fixed-width rows.
- This means that (for example) each Disk Data table record
- containing a <literal>VARCHAR(255)</literal> column requires
- space for 255 characters (as required for the character set
- and collation being used for the table), regardless of the
- actual number of characters stored therein.
</para>
+ <note>
+ <para>
+ MySQL Cluster Disk Data tables (that is, tables created
+ with <literal>TABLESPACE ... STORAGE DISK
+ ENGINE=NDBCLUSTER</literal>) have only fixed-width rows.
+ This means that (for example) each Disk Data table record
+ containing a <literal>VARCHAR(255)</literal> column
+ requires space for 255 characters (as required for the
+ character set and collation being used for the table),
+ regardless of the actual number of characters stored
+ therein.
+ </para>
+ </note>
+
<para>
See <xref linkend="mysql-cluster-limitations"/>, for more
information about these issues.
Modified: trunk/refman-5.2/functions-core.xml
===================================================================
--- trunk/refman-5.2/functions-core.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/functions-core.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 8; 1814 bytes
@@ -16,7 +16,7 @@
with respect to case sensitivity. Specifically, they still carry the
4.0 connotation of binary string meaning a "case sensitive" string,
instead of the 4.1 meaning of "string of bytes without character set
- or collation." Search for "sensitive to find these.
+ or collation." Search for "sensitive to find these".
</remark>
<indexterm>
@@ -12248,14 +12248,19 @@
<para>
Then recompile MySQL. There is no need to rebuild the
- indexes in this case. <emphasis role="bold">Note</emphasis>:
- By making this change, you <emphasis>severely</emphasis>
- decrease MySQL's ability to provide adequate relevance
- values for the <literal>MATCH()</literal> function. If you
- really need to search for such common words, it would be
- better to search using <literal>IN BOOLEAN MODE</literal>
- instead, which does not observe the 50% threshold.
+ indexes in this case.
</para>
+
+ <note>
+ <para>
+ By making this change, you <emphasis>severely</emphasis>
+ decrease MySQL's ability to provide adequate relevance
+ values for the <literal>MATCH()</literal> function. If you
+ really need to search for such common words, it would be
+ better to search using <literal>IN BOOLEAN MODE</literal>
+ instead, which does not observe the 50% threshold.
+ </para>
+ </note>
</listitem>
<listitem>
Modified: trunk/refman-5.2/introduction.xml
===================================================================
--- trunk/refman-5.2/introduction.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/introduction.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 6; 1400 bytes
@@ -2104,12 +2104,12 @@
start-comment sequence. MySQL Server uses
<quote><literal>#</literal></quote> as the start comment
character. MySQL Server 3.23.3 and up also supports a variant
- of the <quote><literal>--</literal></quote> comment style. That
- is, the <quote><literal>--</literal></quote> start-comment
- sequence must be followed by a space (or by a control
- character such as a newline). The space is required to prevent
- problems with automatically generated SQL queries that use
- constructs such as the following, where we automatically
+ of the <quote><literal>--</literal></quote> comment style.
+ That is, the <quote><literal>--</literal></quote>
+ start-comment sequence must be followed by a space (or by a
+ control character such as a newline). The space is required to
+ prevent problems with automatically generated SQL queries that
+ use constructs such as the following, where we automatically
insert the value of the payment for
<literal>payment</literal>:
</para>
Modified: trunk/refman-5.2/partitioning-guide.xml
===================================================================
--- trunk/refman-5.2/partitioning-guide.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/partitioning-guide.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 3, Lines Added: 27, Lines Deleted: 16; 2943 bytes
@@ -2025,13 +2025,17 @@
<para>
The preceding statement would <emphasis>not</emphasis> be
valid, were a different partitioning type to be specified.
- (<emphasis role="bold">Note</emphasis>: In this case, simply
- using <literal>PARTITION BY KEY()</literal> would also be
- valid and have the same effect as <literal>PARTITION BY
- KEY(s1)</literal>, since <literal>s1</literal> is the
- table's primary key.)
</para>
+ <note>
+ <para>
+ In this case, simply using <literal>PARTITION BY
+ KEY()</literal> would also be valid and have the same
+ effect as <literal>PARTITION BY KEY(s1)</literal>, since
+ <literal>s1</literal> is the table's primary key.
+ </para>
+ </note>
+
<para>
For additional information about this issue, see
<xref
@@ -2565,13 +2569,18 @@
so that <filename>t1#P#p0.MYD</filename> is the file in which
data belonging to partition <literal>p0</literal> of table
<literal>t1</literal> is stored.
- <emphasis role="bold">Note</emphasis>: Prior to MySQL 5.1.5,
- these files would have been named <filename>t1_p0.MYD</filename>
- and <filename>t2_p0.MYD</filename>, respectively. See
- <xref linkend="news-5-1-6"/> and Bug #13437 for information
- regarding how this change impacts upgrades.)
</para>
+ <note>
+ <para>
+ Prior to MySQL 5.1.5, these files would have been named
+ <filename>t1_p0.MYD</filename> and
+ <filename>t2_p0.MYD</filename>, respectively. See
+ <xref linkend="news-5-1-6"/> and Bug #13437 for information
+ regarding how this change impacts upgrades.)
+ </para>
+ </note>
+
<para>
You can also demonstrate that these rows were stored in the
lowest partition of the each table by dropping these partitions,
@@ -2923,12 +2932,14 @@
</itemizedlist>
- <para>
- <literal>Note</literal>: In MySQL ¤t-series;, all partitions
- of a partitioned table must have the same number of subpartitions,
- and it is not possible to change the subpartitioning once the
- table has been created.
- </para>
+ <note>
+ <para>
+ In MySQL ¤t-series;, all partitions of a partitioned table
+ must have the same number of subpartitions, and it is not
+ possible to change the subpartitioning once the table has been
+ created.
+ </para>
+ </note>
<para>
The statement <literal>ALTER TABLE ... PARTITION BY ...</literal>
Modified: trunk/refman-5.2/se-myisam.xml
===================================================================
--- trunk/refman-5.2/se-myisam.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/se-myisam.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 8; 1121 bytes
@@ -390,9 +390,13 @@
<para>
The size of the tree cache used in bulk insert optimization.
- <emphasis role="bold">Note</emphasis>: This is a limit
- <emphasis>per thread</emphasis>!
</para>
+
+ <note>
+ <para>
+ This is a limit <emphasis>per thread</emphasis>!
+ </para>
+ </note>
</listitem>
<listitem>
@@ -920,10 +924,7 @@
</itemizedlist>
- <formalpara>
-
- <title>Note</title>
-
+ <note>
<para>
While a compressed table is read-only, and you cannot
therefore update or add rows in the table, DDL (Data
@@ -931,9 +932,8 @@
you may still use <literal>DROP</literal> to drop the table,
and <literal>TRUNCATE</literal> to empty the table.
</para>
+ </note>
- </formalpara>
-
</section>
</section>
Modified: trunk/refman-5.2/tutorial.xml
===================================================================
--- trunk/refman-5.2/tutorial.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/refman-5.2/tutorial.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 8, Lines Added: 19, Lines Deleted: 15; 3728 bytes
@@ -496,8 +496,8 @@
The <literal>'></literal> and <literal>"></literal> prompts
occur during string collection (another way of saying that MySQL
is waiting for completion of a string). In MySQL, you can write
- strings surrounded by either <quote><literal>'</literal></quote> or
- <quote><literal>"</literal></quote> characters (for example,
+ strings surrounded by either <quote><literal>'</literal></quote>
+ or <quote><literal>"</literal></quote> characters (for example,
<literal>'hello'</literal> or <literal>"goodbye"</literal>), and
<command>mysql</command> lets you enter strings that span multiple
lines. When you see a <literal>'></literal> or
@@ -2077,7 +2077,8 @@
</programlisting>
<para>
- To find names ending with <quote><literal>fy</literal></quote>:
+ To find names ending with
+ <quote><literal>fy</literal></quote>:
</para>
<programlisting>
@@ -2091,7 +2092,8 @@
</programlisting>
<para>
- To find names containing a <quote><literal>w</literal></quote>:
+ To find names containing a
+ <quote><literal>w</literal></quote>:
</para>
<programlisting>
@@ -2152,9 +2154,9 @@
<quote><literal>b</literal></quote>, or
<quote><literal>c</literal></quote>. To name a range of
characters, use a dash.
- <quote><literal>[a-z]</literal></quote> matches any letter,
- whereas <quote><literal>[0-9]</literal></quote> matches any
- digit.
+ <quote><literal>[a-z]</literal></quote> matches any
+ letter, whereas <quote><literal>[0-9]</literal></quote>
+ matches any digit.
</para>
</listitem>
@@ -2164,9 +2166,9 @@
instances of the thing preceding it. For example,
<quote><literal>x*</literal></quote> matches any number of
<quote><literal>x</literal></quote> characters,
- <quote><literal>[0-9]*</literal></quote> matches any number
- of digits, and <quote><literal>.*</literal></quote> matches
- any number of anything.
+ <quote><literal>[0-9]*</literal></quote> matches any
+ number of digits, and <quote><literal>.*</literal></quote>
+ matches any number of anything.
</para>
</listitem>
@@ -2220,7 +2222,8 @@
comparison to be case sensitive, use the
<literal>BINARY</literal> keyword to make one of the strings a
binary string. This query matches only lowercase
- <quote><literal>b</literal></quote> at the beginning of a name:
+ <quote><literal>b</literal></quote> at the beginning of a
+ name:
</para>
<programlisting>
@@ -2228,8 +2231,9 @@
</programlisting>
<para>
- To find names ending with <quote><literal>fy</literal></quote>,
- use <quote><literal>$</literal></quote> to match the end of the
+ To find names ending with
+ <quote><literal>fy</literal></quote>, use
+ <quote><literal>$</literal></quote> to match the end of the
name:
</para>
@@ -2244,8 +2248,8 @@
</programlisting>
<para>
- To find names containing a <quote><literal>w</literal></quote>,
- use this query:
+ To find names containing a
+ <quote><literal>w</literal></quote>, use this query:
</para>
<programlisting>
Modified: trunk/userguide/about.xml
===================================================================
--- trunk/userguide/about.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/about.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 6, Lines Added: 77, Lines Deleted: 69; 8868 bytes
@@ -123,85 +123,89 @@
<para>
The idea for a &userguide; came about as a response to the
expressed needs of MySQL users and especially community comments
- about the manuals. This is your chance to help create an important piece of
- MySQL documentation — The MySQL User Guide.
+ about the manuals. This is your chance to help create an important
+ piece of MySQL documentation — The MySQL User Guide.
</para>
-
- <para>
- Contributors will receive credit for their submissions.
- For an example attribution see
- <xref linkend="userguide-mysql-client"/>.
- <remark>[PL] We need to style a formalpara, role = "contributor"</remark>
- </para>
-
+
+ <para>
+ Contributors will receive credit for their submissions. For an
+ example attribution see <xref linkend="userguide-mysql-client"/>.
+
+ <remark>
+ [PL] We need to style a formalpara, role = "contributor"
+ </remark>
+ </para>
+
<section id="userguide-contribution-checklist">
-
+
<title>Contribution Checklist</title>
-
+
<para>
If you do plan to make a contribution to the &userguide;, pay
special attention to the following sections:
-
+
<itemizedlist>
-
+
<listitem>
<para>
<xref linkend="userguide-not-the-manual"/>
</para>
</listitem>
-
+
<listitem>
<para>
<xref linkend="userguide-target-audience"/>
</para>
</listitem>
-
+
<listitem>
<para>
<xref linkend="userguide-contributions-content"/>
</para>
</listitem>
-
+
<listitem>
<para>
<xref linkend="userguide-contributions-format"/>
</para>
</listitem>
-
+
</itemizedlist>
-
+
Familiarity with these sections is essential to determining an
appropriate topic at an appropriate level of complexity.
</para>
-
+
<para>
Additionally, make sure that you have read and understood
<xref to legal status of submissions>.
- <remark>[PL] still need to make the Docs
- CLA (contributor license agreement) available on MySQL Forge.
- Also note the type of licence
+
+ <remark>
+ [PL] still need to make the Docs CLA (contributor license
+ agreement) available on MySQL Forge. Also note the type of
+ licence
</remark>
- Email
- <email>docs@stripped</email> specifying <quote>&userguide;
- Contribution</quote> as the subject line. This email
- should contain a short biography and briefly describe what
- you wish to write about.
+
+ Email <email>docs@stripped</email> specifying
+ <quote>&userguide; Contribution</quote> as the subject line.
+ This email should contain a short biography and briefly describe
+ what you wish to write about.
</para>
-
+
<note>
<para>
- To avoid disappointment,
- please do not write contributions before checking with the MySQL
- documentation team; the TOC is subject to change and someone
- may already be working on your chosen topic.
+ To avoid disappointment, please do not write contributions
+ before checking with the MySQL documentation team; the TOC is
+ subject to change and someone may already be working on your
+ chosen topic.
</para>
-
+
<para>
- While we welcome any submissions, we reserve the right
- to accept or reject submissions as we see fit.
+ While we welcome any submissions, we reserve the right to
+ accept or reject submissions as we see fit.
</para>
</note>
-
+
</section>
<section id="userguide-contributions-content">
@@ -226,11 +230,11 @@
encourage a variety of submissions of different lengths at
differing levels of difficulty. Some sections have already been
completed by MySQL staff and can serve as examples of the kinds
- of submissions we are seeking.
- For example, <xref linkend="userguide-mysqldump-intro"/> could
- serve as a template for a section on
- <command>mysqlimport</command> and <xref linkend="excel-mysql"/>
- could serve as a guide to <xref linkend="userguide-access-mysql"/>.
+ of submissions we are seeking. For example,
+ <xref linkend="userguide-mysqldump-intro"/> could serve as a
+ template for a section on <command>mysqlimport</command> and
+ <xref linkend="excel-mysql"/> could serve as a guide to
+ <xref linkend="userguide-access-mysql"/>.
</para>
<para>
@@ -254,12 +258,11 @@
<para>
The MySQL documentation team uses DocBook, an XML markup
- language particularly suited to software documentation.
- like HTML, it is a derivative of Standard Generalized Markup
- Language (SGML). If you are familiar with HTML, especially XHTML
- then the DocBook format will immediately seem
- familiar. To find out more see
- <ulink url="http://docbook.org">DocBook</ulink>.
+ language particularly suited to software documentation. like
+ HTML, it is a derivative of Standard Generalized Markup Language
+ (SGML). If you are familiar with HTML, especially XHTML then the
+ DocBook format will immediately seem familiar. To find out more
+ see <ulink url="http://docbook.org">DocBook</ulink>.
<remark>
[PL] promotion with O'Reilly?
@@ -273,11 +276,11 @@
PDF, or CHM output for example, thereby eliminating the need to
maintain documentation in a variety of output formats. A
secondary reason for using DocBook is its structured approach to
- documentation. Like any well formed XML document, DocBook imposes
- a structure; subsections must appear within sections and
- sections within chapters and so on. Because
- DocBook is XML it can be written using any text editor though
- you may prefer using an XML-specific editor.
+ documentation. Like any well formed XML document, DocBook
+ imposes a structure; subsections must appear within sections and
+ sections within chapters and so on. Because DocBook is XML it
+ can be written using any text editor though you may prefer using
+ an XML-specific editor.
</para>
<para>
@@ -286,14 +289,20 @@
<ulink url="http://www.oasis-open.org/docbook/documentation/reference/html/docbook.html">
DocBook: The Definitive Guide</ulink>. The MySQL documentation
team doesn't use all the tags supported by DocBook. The subset
- of DocBook tags is found in the MySQL DocBook Markup Guide. [Link to be
- provided shortly.] The MySQL documentation team has also
- prepared DocBook templates to help you get started. You'll find
- them <xref -here>. <remark>[PL] which ones</remark>
+ of DocBook tags is found in the MySQL DocBook Markup Guide.
+ [Link to be provided shortly.] The MySQL documentation team has
+ also prepared DocBook templates to help you get started. You'll
+ find them <xref -here>.
<remark>
- [PL] promotion with oXygen?
+ [PL] which ones
</remark>
+
+
+
+ <remark>
+ [PL] promotion with oXygen?
+ </remark>
</para>
<para>
@@ -302,22 +311,21 @@
a contribution in a format other than DocBook please contact the
documentation team at <email>docs@stripped</email>.
</para>
-
+
<para>
- As far as writing styles and conventions are concerned
- please see the MySQL Style Guide. [Link to be
- provided shortly.]
+ As far as writing styles and conventions are concerned please
+ see the MySQL Style Guide. [Link to be provided shortly.]
</para>
-
+
<para>
- This publication is licenced under the GNU Free Documentation License
- (GFDL). Any submissions are subject to the conditions outlined in this licence.
- A copy is included in <xref linkend="gfdl"/>.
+ This publication is licenced under the GNU Free Documentation
+ License (GFDL). Any submissions are subject to the conditions
+ outlined in this licence. A copy is included in
+ <xref linkend="gfdl"/>.
</para>
-
- </section>
-
+ </section>
+
</section>
<!--End About-->
Modified: trunk/userguide/basic-administration.xml
===================================================================
--- trunk/userguide/basic-administration.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/basic-administration.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 20, Lines Deleted: 31; 1439 bytes
@@ -5,7 +5,6 @@
<!ENTITY % all.entities SYSTEM "all-entities.ent">
%all.entities;
]>
-
<chapter id="userguide-installing">
<title>Basic Administration</title>
@@ -16,55 +15,45 @@
<para></para>
-
-
</section>
-<!-- END INTRODUCTION -->
-
-
- <!--Start MySQL Administrator-->
-
+<!-- END INTRODUCTION -->
+
+<!--Start MySQL Administrator-->
+
<section id="using-mysql-administrator">
-
+
<title>Using MySQL Administrator</title>
-
- <para>
- </para>
-
+
+ <para></para>
+
</section>
-
- <!--End MySQL Administrator-->
-
+<!--End MySQL Administrator-->
+
<!-- Start starting-stopping -->
<section id="starting-stopping-mysqld">
<title>Starting and Stopping the MySQL Server</title>
- <para>
-
- </para>
+ <para></para>
</section>
<!-- End starting-stopping -->
-
- <!--Start administering users-->
-
+
+<!--Start administering users-->
+
<section id="administering-users">
-
+
<title>Administering Users</title>
-
- <para>
-
- </para>
-
+
+ <para></para>
+
</section>
-
- <!--End administering users-->
-
+<!--End administering users-->
+
</chapter>
<!-- END Basic Administration CHAPTER -->
Modified: trunk/userguide/excel-mysql.xml
===================================================================
--- trunk/userguide/excel-mysql.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/excel-mysql.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 5, Lines Added: 28, Lines Deleted: 20; 3227 bytes
@@ -8,7 +8,7 @@
<chapter id="excel-mysql">
<title>Migrating a Spreadsheet to MySQL</title>
-
+
<section id="excel-mysql-introduction">
<title>Introduction</title>
@@ -417,13 +417,13 @@
<literal>association</literal>. To refresh the databases shown in
the <guilabel>Schemata</guilabel> window, right click in this
window and choose the refresh menu option. Next open a script
- window — we'll use this window as a scratch pad to save copies of the
- queries we create. Open a script tab by choosing the <guimenu>New
- Script Tab</guimenu> option from the <guimenu>File</guimenu> menu.
- After doing this two tabs, one labeled
- <guilabel>Resultset1</guilabel> and the other <guilabel>New
- Script</guilabel>, should be visible on the left below the tool
- bar.
+ window — we'll use this window as a scratch pad to save
+ copies of the queries we create. Open a script tab by choosing the
+ <guimenu>New Script Tab</guimenu> option from the
+ <guimenu>File</guimenu> menu. After doing this two tabs, one
+ labeled <guilabel>Resultset1</guilabel> and the other
+ <guilabel>New Script</guilabel>, should be visible on the left
+ below the tool bar.
</para>
<para>
@@ -553,11 +553,12 @@
Browser.
</para>
- <para>
- <emphasis>Note</emphasis>: The <literal>FILE</literal> privilege
- is a global privilege and cannot be restricted to a specific
- database.
- </para>
+ <note>
+ <para>
+ The <literal>FILE</literal> privilege is a global privilege and
+ cannot be restricted to a specific database.
+ </para>
+ </note>
<para>
So far so good, but the syntax shown to this point only works if
@@ -619,10 +620,12 @@
SELECT * FROM alldata LIMIT 0,1000
</programlisting>
- <para>
- <emphasis>Note</emphasis>: A <literal>LIMIT</literal> clause may
- not appear when using Query Browser under Windows.
- </para>
+ <note>
+ <para>
+ A <literal>LIMIT</literal> clause may not appear when using
+ Query Browser under Windows.
+ </para>
+ </note>
<para>
Click the <guibutton>Execute</guibutton> button and you should be
@@ -889,11 +892,16 @@
even if the value is less than 10, the month is expressed as an
abbreviated name, and the year numerically with two digits. All
values are separated by a <quote>-</quote>.
- <emphasis>Note</emphasis>: The complete list of specifiers is
- given in the manual immediately following discussion of the
- <literal>DATE_FORMAT</literal> function.
</para>
+ <note>
+ <para>
+ The complete list of specifiers is given in the manual
+ immediately following discussion of the
+ <literal>DATE_FORMAT</literal> function.
+ </para>
+ </note>
+
<para>
Review the data after executing the <literal>INSERT</literal>
statement. You'll see that dates are now expressed in the default
Modified: trunk/userguide/indexing.xml
===================================================================
--- trunk/userguide/indexing.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/indexing.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 515 bytes
@@ -414,8 +414,7 @@
<para>
The <literal>SHOW</literal> command can be used within the
- active schema to
- display the index information for a table:
+ active schema to display the index information for a table:
</para>
<programlisting>
Modified: trunk/userguide/installing.xml
===================================================================
--- trunk/userguide/installing.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/installing.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 3, Lines Added: 2, Lines Deleted: 4; 733 bytes
@@ -71,7 +71,7 @@
section that follows.
</para>
- <!--section id="installing-downloading-windows">
+<!--section id="installing-downloading-windows">
<title>Downloading MySQL for Microsoft Windows</title>
@@ -99,7 +99,7 @@
</section>
- <!--section>
+<!--section>
<title>Checklist If Installer/RPM Not Used</title>
@@ -142,10 +142,8 @@
<para></para>
</section>
-
<!-- END UPGRADING MYSQL -->
-
</chapter>
<!-- END INSTALLING CHAPTER -->
Modified: trunk/userguide/introduction.xml
===================================================================
--- trunk/userguide/introduction.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/introduction.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 11; 919 bytes
@@ -5,10 +5,10 @@
<!ENTITY % all.entities SYSTEM "all-entities.ent">
%all.entities;
]>
-
<chapter id="userguide-introduction">
-<title>Introduction</title>
+ <title>Introduction</title>
+
<!-- Start Intro -->
<section id="introduction-what-is-mysql">
@@ -71,17 +71,13 @@
<title>Operating Systems Supported</title>
- <para>
-
- </para>
+ <para></para>
<section>
<title>Variations Between Operating Systems</title>
- <para>
-
- </para>
+ <para></para>
</section>
@@ -97,9 +93,7 @@
<title>MySQL On the Web</title>
- <para>
-
- </para>
+ <para></para>
</section>
Modified: trunk/userguide/log-files.xml
===================================================================
--- trunk/userguide/log-files.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/log-files.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 7, Lines Added: 36, Lines Deleted: 36; 5018 bytes
@@ -6,29 +6,29 @@
%all.entities;
]>
<chapter id="userguide-logfiles">
-
+
<title>MySQL Log Files</title>
-
+
<section>
-
+
<title>What They Can Tell You</title>
-
+
<para></para>
-
+
</section>
-
+
<section>
-
+
<title>Error Log</title>
-
+
<para></para>
-
+
</section>
-
+
<section id="logfiles-slow-query-log">
-
+
<title>The Slow Query Log</title>
-
+
<para>
If you need to identify slow queries on a production MySQL server
you may benefit from using the MySQL Slow Query Log. When the
@@ -38,14 +38,14 @@
a log file. The queries in the Slow Query Log can be further
examined and optimized.
</para>
-
+
<para>
The Slow Query Log can also be activated by adding the
<literal>slog-slow-queries</literal> directive to the
<literal>[mysqld]</literal> section of your server option file, or
through the MySQL Administrator:
</para>
-
+
<figure>
<title>Activating the Slow Query Log using MySQL Administrator</title>
<mediaobject>
@@ -54,21 +54,21 @@
</imageobject>
<textobject>
<phrase lang="en">Activating the Slow Query Log using MySQL
- Administrator</phrase>
+ Administrator</phrase>
</textobject>
</mediaobject>
</figure>
-
+
<para>
The <literal>Slow Queries Log</literal> option is found in the
<literal>Log Files</literal> tab of the <literal>Startup
- Variables</literal> screen. Click the clipboard icon to the left
+ Variables</literal> screen. Click the clipboard icon to the left
of the option to activate the Slow Query Log and click the
<guibutton>Apply Changes</guibutton> button. Once the Slow Query
Log is activated, restart the MySQL server using the
<literal>Service Control</literal> screen.
</para>
-
+
<para>
The default name of the log file is
<filename><replaceable>server-name</replaceable>-slow.log</filename>.
@@ -76,18 +76,18 @@
<literal>doomhammer.myserver.org</literal>, the log file will be
named <filename>doomhammer.myserver.org-slow.log</filename>.
</para>
-
+
<para>
The Slow Query Log is a plain-text file that contains three lines
for every query logged:
</para>
-
- <programlisting>
+
+<programlisting>
# User@Host: root[root] @ localhost [127.0.0.1]
# Query_time: 0 Lock_time: 0 Rows_sent: 1 Rows_examined: 3
SELECT last_name, first_name, actor_id FROM actor WHERE last_name = 'Brando';
</programlisting>
-
+
<para>
The first line lists the username and hostname of the user who
executed the query. The second line lists the time taken to
@@ -96,13 +96,13 @@
rows the MySQL optimizer needed to examine. The final line of the
entry shows the query that was executed.
</para>
-
+
<para>
The Slow Query Log can also be read using the MySQL Administrator
using the <literal>Slow Log</literal> tab of the <literal>Server
- Logs</literal> screen:
+ Logs</literal> screen:
</para>
-
+
<figure>
<title>Viewing the Slow Query Log with MySQL Administrator</title>
<mediaobject>
@@ -111,11 +111,11 @@
</imageobject>
<textobject>
<phrase lang="en">Viewing the Slow Query Log with MySQL
- Administrator</phrase>
+ Administrator</phrase>
</textobject>
</mediaobject>
</figure>
-
+
<para>
The Slow Queries Log determines whether a query is slow by how
long the query takes to execute in seconds, not counting the time
@@ -128,33 +128,33 @@
<literal>Startup Variables</literal> screen of MySQL
Administrator.
</para>
-
+
<para>
It should be noted that queries can appear in the Slow Query Log
even if they are properly optimized if the server load is high
enough to cause the query to take longer than the
<literal>long_query_time</literal>.
</para>
-
+
<para>
If you wish to log all queries that do not use indexes, regardless
of how long the queries take to execute, add the
<literal>log-queries-not-using-indexes</literal> option to the
<literal>[mysqld]</literal> section of your MySQL server
configuration file, or check the <literal>Log queries that don't
- use indexes</literal> option of the <literal>Log Files</literal>
+ use indexes</literal> option of the <literal>Log Files</literal>
tab of the <literal>Startup Variables</literal> screen of MySQL
Administrator.
</para>
-
+
</section>
-
+
<section>
-
+
<title>Utilities for Use with the Logs</title>
-
+
<para></para>
-
+
</section>
-
+
</chapter>
Modified: trunk/userguide/modifying.xml
===================================================================
--- trunk/userguide/modifying.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/modifying.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 586 bytes
@@ -15,7 +15,7 @@
<!-- END INSERT -->
- <!--section id="modifying-update">
+<!--section id="modifying-update">
<title>Changing Data with the UPDATE Statement</title>
@@ -25,7 +25,7 @@
<!-- END UPDATE -->
- <!--section id="modifying-delete">
+<!--section id="modifying-delete">
<title>Removing Data with the DELETE Statement</title>
Modified: trunk/userguide/mysql-client-programs.xml
===================================================================
--- trunk/userguide/mysql-client-programs.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/mysql-client-programs.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 14, Lines Added: 70, Lines Deleted: 61; 9122 bytes
@@ -8,32 +8,32 @@
<chapter id="mysql-client-programs">
<title>MySQL Client Programs</title>
-
- <!-- Start mysql client -->
-
+
+<!-- Start mysql client -->
+
<section id="mysql-client-intro">
-
+
<title>The MySQL Client Programs</title>
-
+
<para></para>
+
</section>
-
- <!-- End mysql client -->
-
+<!-- End mysql client -->
+
<section id="userguide-mysql-client">
<title>The MySQL Client</title>
-
+
<formalpara role="contributor">
-
+
<title>MySQL Contributor</title>
-
+
<para>
- This section was contributed by MySQL staff.
- For more information see <ulink url="http://mysql.com"/>.
+ This section was contributed by MySQL staff. For more
+ information see <ulink url="http://mysql.com"/>.
</para>
-
+
</formalpara>
<para>
@@ -87,13 +87,13 @@
However, we won't be discussing SQL commands here. The purpose of
this section is to explain the options and commands most commonly
used with the MySQL client. Using these options and commands is an
- essential part of mastering MySQL.
- Options passed to the <command>mysql</command> command make
- connecting to a MySQL server possible and also change the way that
- the <command>mysql</command> client program behaves. Some of these
- options are absolutely essential, some are nice to know, and
- others are used infrequently. We will deal with the essential and
- nice-to-know options.
+ essential part of mastering MySQL. Options passed to the
+ <command>mysql</command> command make connecting to a MySQL server
+ possible and also change the way that the <command>mysql</command>
+ client program behaves. Some of these options are absolutely
+ essential, some are nice to know, and others are used
+ infrequently. We will deal with the essential and nice-to-know
+ options.
</para>
<!-- start essential options -->
@@ -159,12 +159,12 @@
<para>
A MySQL server runs on a specific host and listens on a specific
- port. The MySQL client can connect to the server using TCP/IP and
- for this reason you must provide <option>--host</option> and
+ port. The MySQL client can connect to the server using TCP/IP
+ and for this reason you must provide <option>--host</option> and
<option>--port</option> options.
</para>
-
- <!--note>
+
+<!--note>
<para>
When connecting to a MySQL server running on a Unix
machine ...
@@ -202,7 +202,10 @@
<literal>root</literal>, as the user name. There is no
password for this default user. For information on creating
additional users see <xref>.
- <remark>Difference between 127.0.0.1 and localhost on Unix?</remark>
+
+ <remark>
+ Difference between 127.0.0.1 and localhost on Unix?
+ </remark>
</para>
</note>
@@ -437,11 +440,13 @@
shell> <userinput>mysql <option>-u <replaceable>user_name</replaceable> -p --tee=<replaceable>outfile.html</replaceable> --html</option></userinput>
</programlisting>
- <para>
- <emphasis>Note</emphasis>: There is no short form for the
- <option>--tee=<replaceable>file_name</replaceable></option>
- option.
- </para>
+ <note>
+ <para>
+ There is no short form for the
+ <option>--tee=<replaceable>file_name</replaceable></option>
+ option.
+ </para>
+ </note>
<para>
The <option>--tee=<replaceable>file_name</replaceable></option>
@@ -496,10 +501,10 @@
shell
</para>
</listitem>
-
+
<listitem>
<para>
- <command>ego, \G</command> – send the statement to the
+ <command>ego, \G</command> – send the statement to the
server and display the result vertically.
</para>
</listitem>
@@ -547,11 +552,11 @@
To quit the MySQL shell use one of the forms of the
<command>quit</command> command.
</para>
-
+
<para>
- The <command>ego</command> command can be especially useful
- when issuing a select statement that returns one record
- with numerous columns. For example issuing the select statement,
+ The <command>ego</command> command can be especially useful when
+ issuing a select statement that returns one record with numerous
+ columns. For example issuing the select statement,
<literal>SELECT * FROM mysql.user WHERE User=`root`\G</literal>,
produces much more readable output than the same statement
terminated by a <quote><literal>;</literal></quote>.
@@ -567,7 +572,7 @@
files is especially useful when you have repetitive tasks to
perform. Script files are discussed in detail in <xref>.
</para>
-
+
<para>
An alternative to the <command>source</command> command is to
redirect a script file to the <command>mysql</command> command
@@ -601,8 +606,8 @@
when issued without an argument, outputs a list of all the
commands but no options. For a complete list of all the
available commands see
- <xref linkend="userguide-options-tables-utilities"/>, or
- from the <command>mysql</command> shell, issue the command
+ <xref linkend="userguide-options-tables-utilities"/>, or from
+ the <command>mysql</command> shell, issue the command
<userinput>?</userinput>.
</para>
@@ -705,15 +710,15 @@
<para>
The <command>mysqladmin</command> program is a client utility for
- administering a MySQL server.
- As is the case with most MySQL utilities, there are often
- alternatives to using <command>mysqladmin</command>. The GUI Tool,
- MySQL Administrator, for example, can do most of the tasks
- performed by <command>mysqladmin</command> and is a very useful
- administrative tool especially if you are new to MySQL. This
- application is examined in detail in <xref>. Likewise, many
- of the capabilities of <command>mysqladmin</command> are also
- available when using the MySQL client program.
+ administering a MySQL server. As is the case with most MySQL
+ utilities, there are often alternatives to using
+ <command>mysqladmin</command>. The GUI Tool, MySQL Administrator,
+ for example, can do most of the tasks performed by
+ <command>mysqladmin</command> and is a very useful administrative
+ tool especially if you are new to MySQL. This application is
+ examined in detail in <xref>. Likewise, many of the
+ capabilities of <command>mysqladmin</command> are also available
+ when using the MySQL client program.
</para>
<para>
@@ -728,7 +733,7 @@
for complete coverage of this utility see
<ulink url="&base-url-refman;5.0/en/mysqladmin.html"/>. The more
advanced commands and options of <command>mysqladmin</command>
- will be discussed in more detail in <xref>.
+ will be discussed in more detail in <xref>.
</para>
<!-- start options -->
@@ -817,8 +822,8 @@
</para>
<para>
- Find a complete
- list of all the options and commands in <xref
+ Find a complete list of all the options and commands in
+ <xref
linkend="userguide-options-tables-utilities"/>.
</para>
@@ -849,11 +854,13 @@
shell> <userinput>mysqladmin shutdown <option>-u <replaceable>user_name</replaceable> -p</option></userinput>
</programlisting>
- <para>
- <emphasis>Note</emphasis>: This is a command rather than an
- option so do not precede <literal>shutdown</literal> with
- <quote><literal>--</literal></quote>. The reasons for shutting
- down a MySQL server are various:
+ <note>
+ <para>
+ This is a command rather than an option so do not precede
+ <literal>shutdown</literal> with
+ <quote><literal>--</literal></quote>. The reasons for
+ shutting down a MySQL server are various:
+ </para>
<itemizedlist>
@@ -877,13 +884,15 @@
</itemizedlist>
- This command is used extensively in <xref>. In that
- section we examine the configuration file
- (<filename>my.ini</filename> under Windows,
+ <para>
+ This command is used extensively in <xref>. In that
+ section we examine the configuration file
+ (<filename>my.ini</filename> under Windows,
<filename>my.cnf</filename> under Unix). In order for
configuration changes to have effect the server must be
stopped and restarted.
- </para>
+ </para>
+ </note>
</section>
Modified: trunk/userguide/mysql-server-programs.xml
===================================================================
--- trunk/userguide/mysql-server-programs.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/mysql-server-programs.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 10; 2158 bytes
@@ -113,7 +113,7 @@
disable it.
</para>
- <!--para>
+<!--para>
server variables ======================== showing system vars h/t
to check the user that mysqld is running as
</para-->
@@ -140,16 +140,19 @@
</para>
<para>
- Options in <filename>/etc/my.cnf</filename> and
+ Options in <filename>/etc/my.cnf</filename> and
<filename>$MYSQL_HOME/my.cnf</filename> are processed before
- command-line options, so it is recommended that you put a <option>--user</option>
- option in the configuration file and specify a value other than root. The
- option in the configuration file is found before any other <option>--user</option> options,
+ command-line options, so it is recommended that you put a
+ <option>--user</option> option in the configuration file and
+ specify a value other than root. The option in the configuration
+ file is found before any other <option>--user</option> options,
which ensures that the server runs as a user other than root, and
- that a warning results if any other <option>--user</option> option is found.
- <remark>[PL]
- Above from
- http://dev.mysql.com/doc/refman/5.0/en/server-options.html#optvar_user
+ that a warning results if any other <option>--user</option> option
+ is found.
+
+ <remark>
+ [PL] Above from
+ http://dev.mysql.com/doc/refman/5.0/en/server-options.html#optvar_user
</remark>
</para>
@@ -180,7 +183,7 @@
<title>Changing Your Configuration File</title>
- <!--para>
+<!--para>
This section shows a sample configuration file for the purpose of
simplifying your interaction with MySQL and alerting you to some
common settings that you may want to adjust. You have already
@@ -253,6 +256,7 @@
<para>
!includedir
</para-->
+
<para></para>
</section>
Modified: trunk/userguide/php-pdo.xml
===================================================================
--- trunk/userguide/php-pdo.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/php-pdo.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 6, Lines Added: 51, Lines Deleted: 53; 8358 bytes
@@ -122,10 +122,10 @@
<para>
The attached compressed file contains all the code and preserves
the required directory structure. Find that file
- <ulink url="code.tar.gz">here</ulink>. Any user-defined classes are
- found in the <filename>classes</filename> directory and XML files are found in
- the <filename>xml</filename> directory. The PHP scripts are found
- at the root directory.
+ <ulink url="code.tar.gz">here</ulink>. Any user-defined classes
+ are found in the <filename>classes</filename> directory and XML
+ files are found in the <filename>xml</filename> directory. The PHP
+ scripts are found at the root directory.
</para>
</section>
@@ -485,15 +485,14 @@
<para>
A PDO connection is created by passing a Data Source Name (DSN) to
the PDO constructor. A DSN is made up of the driver name followed
- by a colon and then driver-specific connection requirements. When using MySQL,
- you specify <literal>mysql:</literal> followed by the host name,
- database name, and database credentials. These connection
- parameters are contained in the
+ by a colon and then driver-specific connection requirements. When
+ using MySQL, you specify <literal>mysql:</literal> followed by the
+ host name, database name, and database credentials. These
+ connection parameters are contained in the
<filename>connection.php</filename> file. It is also possible to
connect to a database by invoking a URI. You could, for example,
construct a PDO instance by pointing to a file that contains the
- DSN string. Do this in the following way: <literal>$db =
- new
+ DSN string. Do this in the following way: <literal>$db = new
PDO("<replaceable>uri:file:///path/to/dsnfile</replaceable>);</literal>.
</para>
@@ -657,14 +656,14 @@
Creating a record in the primary table,
<literal>tblclasses</literal>, is done by first creating the
necessary SQL statement. This is done using the
- <literal>XMLFormatToSQL::createClassSQL</literal> method. Note how this
- method uses the <literal>PDO::quote</literal> method to quote
+ <literal>XMLFormatToSQL::createClassSQL</literal> method. Note how
+ this method uses the <literal>PDO::quote</literal> method to quote
variables. Literals may also be used (see the
<literal>XMLFormatToSQL::createMethodsSQL</literal> for example)
but <literal>quote</literal> has the advantage of being
- database-neutral. However, the recommended way for quoting
- and escaping special characters is to use prepared statements.
- You'll see how this is done shortly.
+ database-neutral. However, the recommended way for quoting and
+ escaping special characters is to use prepared statements. You'll
+ see how this is done shortly.
</para>
<para>
@@ -712,21 +711,20 @@
replaceable parameters indicated by question marks. Pass this
statement as a parameter to the <literal>PDO::prepare</literal>
method. Use the returned <literal>PDOStatement</literal> object to
- bind parameters. Binding can be more or less fine-grained.
- You must pass a parameter identifier and the associated variable
- but you can also optionally pass the data type, length of the
- data type, and other driver-specific options.
+ bind parameters. Binding can be more or less fine-grained. You
+ must pass a parameter identifier and the associated variable but
+ you can also optionally pass the data type, length of the data
+ type, and other driver-specific options.
</para>
-
- <para>
- The first prepared statement parameter, the name of the constant, is
- always a string so it make sense to also specify the data type,
- <literal>PDO::PARAM_STR</literal>. The length of this
- parameter will vary so specifying the length doesn't make sense.
- The second parameter to the
- prepared statement is the value of the constant. This can be
- either an integer or a string so the data type cannot be specified
- when this parameter is bound.
+
+ <para>
+ The first prepared statement parameter, the name of the constant,
+ is always a string so it make sense to also specify the data type,
+ <literal>PDO::PARAM_STR</literal>. The length of this parameter
+ will vary so specifying the length doesn't make sense. The second
+ parameter to the prepared statement is the value of the constant.
+ This can be either an integer or a string so the data type cannot
+ be specified when this parameter is bound.
</para>
<para>
@@ -751,21 +749,21 @@
There is only one <literal>catch</literal> block. Because a PDO
exception is derived from the <literal>Exception</literal> class,
this block catches any kind of exception. Happily, should you pass
- an incorrect DSN to the constructor, a PDOException is
- thrown even though no PDO object is created. (Hence the need
- to test the <literal>$db</literal> variable before calling the
+ an incorrect DSN to the constructor, a PDOException is thrown even
+ though no PDO object is created. (Hence the need to test the
+ <literal>$db</literal> variable before calling the
<literal>rollBack</literal> method.)
</para>
-
+
<para>
- Should an exception
- be thrown any changes already made can be rolled back using the
- <literal>rollBack</literal> method. If there is a failure at any
- point, no records will be added to any tables. Do this and you
- avoid the possibility of storing incomplete information in the
- database. You will know that you have all the elements of a class
- or none of them, saving what could perhaps be a messy clean-up job
- if only some statements fail and others are committed.
+ Should an exception be thrown any changes already made can be
+ rolled back using the <literal>rollBack</literal> method. If there
+ is a failure at any point, no records will be added to any tables.
+ Do this and you avoid the possibility of storing incomplete
+ information in the database. You will know that you have all the
+ elements of a class or none of them, saving what could perhaps be
+ a messy clean-up job if only some statements fail and others are
+ committed.
</para>
<para>
@@ -783,24 +781,24 @@
</para>
<para>
- PDO makes migrating to different databases easy; in some cases requiring only
- that the DSN be updated. For example, an SQLite
- DSN requires only the driver name and a path to the database —
+ PDO makes migrating to different databases easy; in some cases
+ requiring only that the DSN be updated. For example, an SQLite DSN
+ requires only the driver name and a path to the database —
<literal>"sqlite:<replaceable>mydb.sqlite</replaceable>"</literal>.
Changing this to
<literal>"mysql:host=$host;dbname=$database,$username,
$password"</literal> may be all you need to do to change the
- database backend. However, any non-standard SQL
- statements also need to be changed. For instance, any statements
- that used the SQLite string concatenation operator,
- <literal>||</literal>, would need to be changed to use the MySQL
- function, <literal>CONCAT()</literal>.
+ database backend. However, any non-standard SQL statements also
+ need to be changed. For instance, any statements that used the
+ SQLite string concatenation operator, <literal>||</literal>, would
+ need to be changed to use the MySQL function,
+ <literal>CONCAT()</literal>.
</para>
-
+
<para>
- PDO is a data-access abstraction layer providing uniform, object-oriented
- methods for accessing different databases or different versions of
- the same database.
+ PDO is a data-access abstraction layer providing uniform,
+ object-oriented methods for accessing different databases or
+ different versions of the same database.
</para>
</section>
Modified: trunk/userguide/populating.xml
===================================================================
--- trunk/userguide/populating.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/populating.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 436 bytes
@@ -15,7 +15,7 @@
<!-- END SQL FILE -->
- <!--section id="populating-load-data">
+<!--section id="populating-load-data">
<title>Populating a Schema with the LOAD DATA Statement</title>
Modified: trunk/userguide/querying.xml
===================================================================
--- trunk/userguide/querying.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/querying.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 8, Lines Added: 12, Lines Deleted: 12; 1635 bytes
@@ -21,7 +21,7 @@
<!-- END SELECT CLAUSE -->
- <!--section id="querying-select-from-clause">
+<!--section id="querying-select-from-clause">
<title>The FROM Clause</title>
@@ -31,7 +31,7 @@
<!-- END FROM CLAUSE -->
- <!--section id="querying-select-where-clause">
+<!--section id="querying-select-where-clause">
<title>The WHERE Clause</title>
@@ -41,7 +41,7 @@
<!-- END WHERE CLAUSE -->
- <!--section id="querying-select-group-by-clause">
+<!--section id="querying-select-group-by-clause">
<title>The GROUP BY Clause</title>
@@ -51,7 +51,7 @@
<!-- END GROUP BY -->
- <!--section id="querying-select-having-clause">
+<!--section id="querying-select-having-clause">
<title>The Having Clause</title>
@@ -61,7 +61,7 @@
<!-- END HAVING -->
- <!--section id="querying-select-order-by">
+<!--section id="querying-select-order-by">
<title>The ORDER BY Clause</title>
@@ -71,7 +71,7 @@
<!-- END ORDER BY -->
- <!--section id="querying-select-limit-clause">
+<!--section id="querying-select-limit-clause">
<title>The LIMIT Clause</title>
@@ -80,10 +80,10 @@
</section-->
<!-- END LIMIT -->
-
- <!--joins-->
-
- <!--section>
+
+<!--joins-->
+
+<!--section>
<title>Joins</title>
@@ -104,9 +104,9 @@
</section>
</section-->
-
- <!--end joins-->
+<!--end joins-->
+
</section>
<!-- END SELECT -->
Modified: trunk/userguide/storage-engines.xml
===================================================================
--- trunk/userguide/storage-engines.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/storage-engines.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 4; 388 bytes
@@ -5,11 +5,8 @@
<title>MySQL Storage Engines</title>
-
+ <para></para>
- <para></para>
-
-
<!-- END OTHER -->
</chapter>
Modified: trunk/userguide/userguide.xml
===================================================================
--- trunk/userguide/userguide.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/userguide.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 10, Lines Added: 16, Lines Deleted: 16; 2388 bytes
@@ -27,19 +27,18 @@
</abstract>
- <!--xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/-->
+<!--xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/-->
</bookinfo>
-
+
<xi:include href="about.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
<!--Start Part I-->
<part label="I">
- <title>Getting Started</title>
-
+ <title>Getting Started</title>
+
<xi:include href="introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="installing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
@@ -167,7 +166,7 @@
<para></para>
</section>
-
+
</chapter>
<!--end Functions-->
@@ -200,7 +199,7 @@
</section>
- <!--section>
+<!--section>
<title>Database Normalization</title>
@@ -270,7 +269,7 @@
</section>
- <!--section>
+<!--section>
<title>Events</title>
@@ -332,7 +331,7 @@
<!--end Optimizing-->
- <!--chapter>
+<!--chapter>
<title>Miscellaneous</title>
@@ -432,7 +431,7 @@
</para>
</listitem>
- <!--listitem>
+<!--listitem>
<para>
myisamlog
</para>
@@ -452,7 +451,7 @@
</itemizedlist>
- <!--para>
+<!--para>
mysql_install_db initializes the MySQL data directory instance
manager and the mysql.server file found in /usr/share/mysql on
Suse manual says /etc/init.d
@@ -464,10 +463,11 @@
<title>Advanced Features of Previously Mentioned Utilities</title>
- <!--para>
+<!--para>
using compression with mysqldump using FOREIGN_KEY_CHECKS with
dump files
</para-->
+
<para></para>
</section>
@@ -533,11 +533,11 @@
<title>Using the Connector/.NET API with MySQL</title>
<section id="net-install">
-
+
<title>Obtaining and Installing Connector/NET</title>
-
+
<para></para>
-
+
</section>
</chapter>
@@ -654,8 +654,8 @@
</appendix>
-
<xi:include href="gnu-fdl.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
</part>
</book>
Modified: trunk/userguide/views.xml
===================================================================
--- trunk/userguide/views.xml 2007-10-14 17:10:06 UTC (rev 8086)
+++ trunk/userguide/views.xml 2007-10-14 18:04:12 UTC (rev 8087)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 565 bytes
@@ -15,7 +15,7 @@
<!-- END WHAT -->
- <!--section id="views-creating">
+<!--section id="views-creating">
<title>The InnoDB Storage Engine</title>
@@ -25,7 +25,7 @@
<!-- END CREATING -->
- <!--section id="views-security">
+<!--section id="views-security">
<title>Using VIEWs to Grant Access to Portions of Your Data</title>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8087 - in trunk: administrator arbitrary gui-common mysqlqb mysqltest ndbapi query-browser quick-guides refman-4.1 ref... | mcbrown | 14 Oct |
