Author: paul
Date: 2007-10-12 02:31:06 +0200 (Fri, 12 Oct 2007)
New Revision: 8067
Log:
r25496@frost: paul | 2007-10-11 19:27:38 -0500
Adjust admonitions.
Modified:
trunk/refman-5.0/news-5.0.xml
trunk/refman-5.1/news-5.1.xml
trunk/refman-common/connector-net.xml
trunk/refman-common/news-cluster.xml
trunk/refman-common/news-connector-net.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30950
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25449
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30950
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25496
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/refman-5.0/news-5.0.xml
===================================================================
--- trunk/refman-5.0/news-5.0.xml 2007-10-11 21:19:42 UTC (rev 8066)
+++ trunk/refman-5.0/news-5.0.xml 2007-10-12 00:31:06 UTC (rev 8067)
Changed blocks: 6, Lines Added: 49, Lines Deleted: 34; 5201 bytes
@@ -7020,12 +7020,17 @@
<listitem>
<para>
The use of <literal>LOAD INDEX</literal> within a stored
- routine was permitted and caused the server to crash.
- <emphasis role="bold">Note</emphasis>: <literal>LOAD
- INDEX</literal> statements within stored routines
- <emphasis>are not supported</emphasis>, and now yield an error
- if attempted. This behavior is intended. (Bug #14270)
+ routine was permitted and caused the server to crash. (Bug
+ #14270)
</para>
+
+ <note>
+ <para>
+ <literal>LOAD INDEX</literal> statements within stored
+ routines <emphasis>are not supported</emphasis>, and now
+ yield an error if attempted. This behavior is intended.
+ </para>
+ </note>
</listitem>
<listitem>
@@ -8607,12 +8612,16 @@
<literal>0xF9D6</literal>, <literal>0xF9D7</literal>,
<literal>0xF9D8</literal>, <literal>0xF9D9</literal>,
<literal>0xF9DA</literal>, <literal>0xF9DB</literal>, and
- <literal>0xF9DC</literal>.
- <emphasis role="bold">Note</emphasis>: If you move data
- containing these additional characters to an older MySQL
- installation which does not support them, you may encounter
- errors. (Bug #12476)
+ <literal>0xF9DC</literal>. (Bug #12476)
</para>
+
+ <note>
+ <para>
+ If you move data containing these additional characters to
+ an older MySQL installation which does not support them, you
+ may encounter errors.
+ </para>
+ </note>
</listitem>
<listitem>
@@ -12830,12 +12839,11 @@
<para>
Executing a statement that invoked a trigger would cause
problems unless a <literal>LOCK TABLES</literal> was first
- issued for any tables accessed by the trigger.
- <emphasis role="bold">Note</emphasis>: The exact nature of the
- problem depended upon the MySQL 5.0 release being used: prior
- to 5.0.3, this resulted in a crash; from 5.0.3 to 5.0.7, MySQL
- would issue a warning; in 5.0.9, the server would issue an
- error. (Bug #8406)
+ issued for any tables accessed by the trigger. The exact
+ nature of the problem depended upon the MySQL 5.0 release
+ being used: prior to 5.0.3, this resulted in a crash; from
+ 5.0.3 to 5.0.7, MySQL would issue a warning; in 5.0.9, the
+ server would issue an error. (Bug #8406)
</para>
<para>
@@ -13425,16 +13433,17 @@
addition, any of the commands <literal>USE NUL;</literal>,
<literal>USE CON;</literal>, <literal>USE COM1;</literal>, or
<literal>USE AUX;</literal> would report success even though
- the database was not in fact changed.
- <emphasis role="bold">Note</emphasis>: Although this bug was
- thought to be fixed previously, it was later discovered to be
- present in the MySQL 5.0.7-beta release for Windows. (Bug
- #9148, CVE-2005-0799
+ the database was not in fact changed. (Bug #9148,
+ CVE-2005-0799)
</para>
- <remark>
- **END security fix item**
- </remark>
+ <note>
+ <para>
+ Although this bug was thought to be fixed previously, it was
+ later discovered to be present in the MySQL 5.0.7-beta
+ release for Windows.
+ </para>
+ </note>
</listitem>
<listitem>
@@ -18942,13 +18951,14 @@
<itemizedlist>
<listitem>
- <para>
- <emphasis role="bold">Important note:</emphasis> If you
- upgrade to MySQL 4.1.1 or higher, it is difficult to downgrade
- back to 4.0 or 4.1.0! That is because, for earlier versions,
- <literal>InnoDB</literal> is not aware of multiple
- tablespaces.
- </para>
+ <important>
+ <para>
+ If you upgrade to MySQL 4.1.1 or higher, it is difficult to
+ downgrade back to 4.0 or 4.1.0! That is because, for earlier
+ versions, <literal>InnoDB</literal> is not aware of multiple
+ tablespaces.
+ </para>
+ </important>
</listitem>
<listitem>
@@ -19055,10 +19065,15 @@
<listitem>
<para>
<literal>LOAD DATA INFILE</literal> causes an implicit commit.
- <emphasis role="bold">Important</emphasis>: The behaviour of
- <literal>LOAD DATA INFILE</literal> in this regard was changed
- again in MySQL 5.0.26. See <xref linkend="news-5-0-26"/>.
</para>
+
+ <important>
+ <para>
+ The behavior of <literal>LOAD DATA INFILE</literal> in this
+ regard was changed again in MySQL 5.0.26. See
+ <xref linkend="news-5-0-26"/>.
+ </para>
+ </important>
</listitem>
<listitem>
Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml 2007-10-11 21:19:42 UTC (rev 8066)
+++ trunk/refman-5.1/news-5.1.xml 2007-10-12 00:31:06 UTC (rev 8067)
Changed blocks: 2, Lines Added: 15, Lines Deleted: 10; 1496 bytes
@@ -23595,12 +23595,13 @@
use a different storage engine. (Bug #19010)
</para>
- <para>
- <emphasis remap="bold">Note</emphasis>: As a consequence of
- this fix, <literal>SHOW CREATE TABLE</literal> no longer
- displays auto-partitioning information for
- <literal>NDBCluster</literal> tables.
- </para>
+ <note>
+ <para>
+ As a consequence of this fix, <literal>SHOW CREATE
+ TABLE</literal> no longer displays auto-partitioning
+ information for <literal>NDBCluster</literal> tables.
+ </para>
+ </note>
</listitem>
<listitem>
@@ -26100,11 +26101,15 @@
<listitem>
<para>
<literal>NDB Cluster</literal>: A node restart immediately
- following a <literal>CREATE TABLE</literal> would fail.
- <emphasis role="bold"
- >Important</emphasis>: This
- fix supports 2-node Clusters only. (Bug #18385)
+ following a <literal>CREATE TABLE</literal> would fail. (Bug
+ #18385)
</para>
+
+ <important>
+ <para>
+ This fix supports 2-node Clusters only.
+ </para>
+ </important>
</listitem>
<listitem>
Modified: trunk/refman-common/connector-net.xml
===================================================================
--- trunk/refman-common/connector-net.xml 2007-10-11 21:19:42 UTC (rev 8066)
+++ trunk/refman-common/connector-net.xml 2007-10-12 00:31:06 UTC (rev 8067)
Changed blocks: 1, Lines Added: 21, Lines Deleted: 18; 2312 bytes
@@ -4100,25 +4100,28 @@
instead of 'false'.
</para>
- <para>
- <literal>Note</literal> The MySQL Data Provider uses the
- native socket protocol to communicate with MySQL. Therefore,
- it does not support the use of an ODBC data source name (DSN)
- when connecting to MySQL because it does not add an ODBC
- layer.
- </para>
+ <note>
+ <para>
+ The MySQL Data Provider uses the native socket protocol to
+ communicate with MySQL. Therefore, it does not support the
+ use of an ODBC data source name (DSN) when connecting to
+ MySQL because it does not add an ODBC layer.
+ </para>
+ </note>
- <para>
- <literal>CAUTION</literal> In this release, the application
- should use caution when constructing a connection string based
- on user input (for example when retrieving user ID and
- password information from a dialog box, and appending it to
- the connection string). The application should ensure that a
- user cannot embed extra connection string parameters in these
- values (for example, entering a password as
- "validpassword;database=somedb" in an attempt to attach to a
- different database).
- </para>
+ <caution>
+ <para>
+ In this release, the application should use caution when
+ constructing a connection string based on user input (for
+ example when retrieving user ID and password information
+ from a dialog box, and appending it to the connection
+ string). The application should ensure that a user cannot
+ embed extra connection string parameters in these values
+ (for example, entering a password as
+ "validpassword;database=somedb" in an attempt to attach to a
+ different database).
+ </para>
+ </caution>
<para>
<emphasis role="bold">Examples</emphasis>
Modified: trunk/refman-common/news-cluster.xml
===================================================================
--- trunk/refman-common/news-cluster.xml 2007-10-11 21:19:42 UTC (rev 8066)
+++ trunk/refman-common/news-cluster.xml 2007-10-12 00:31:06 UTC (rev 8067)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 6; 1230 bytes
@@ -1767,13 +1767,18 @@
alias for <literal>[API]</literal>, and
<literal>[NDB_MGMD]</literal> as an alias for
<literal>[MGM]</literal>.
- <emphasis role="bold">Note</emphasis>: In fact,
- <literal>[NDBD]</literal>, <literal>[MYSQLD]</literal>, and
- <literal>[NDB_MGMD]</literal> are now the preferred
- designations, although the older ones will continue to be
- supported for some time to come in order to maintain backward
- compatibility.
</para>
+
+ <note>
+ <para>
+ In fact, <literal>[NDBD]</literal>,
+ <literal>[MYSQLD]</literal>, and
+ <literal>[NDB_MGMD]</literal> are now the preferred
+ designations, although the older ones will continue to be
+ supported for some time to come in order to maintain
+ backward compatibility.
+ </para>
+ </note>
</listitem>
<listitem>
Modified: trunk/refman-common/news-connector-net.xml
===================================================================
--- trunk/refman-common/news-connector-net.xml 2007-10-11 21:19:42 UTC (rev 8066)
+++ trunk/refman-common/news-connector-net.xml 2007-10-12 00:31:06 UTC (rev 8067)
Changed blocks: 1, Lines Added: 13, Lines Deleted: 13; 1764 bytes
@@ -1358,19 +1358,19 @@
discovered bugs.
</para>
- <para role="release-non-production">
- <emphasis role="bold">NOTE:</emphasis> This Alpha release, as any
- other pre-production release, should not be installed on
- <emphasis>production</emphasis> level systems or systems with
- critical data. It is good practice to back up your data before
- installing any new version of software. Although MySQL has worked
- very hard to ensure a high level of quality, protect your data by
- making a backup as you would for any software beta release. Please
- refer to our bug database at
- <ulink
- url="http://bugs.mysql.com/"/> for more details
- about the individual bugs fixed in this version.
- </para>
+ <note>
+ <para role="release-non-production">
+ This Alpha release, as any other pre-production release, should
+ not be installed on <emphasis>production</emphasis> level
+ systems or systems with critical data. It is good practice to
+ back up your data before installing any new version of software.
+ Although MySQL has worked very hard to ensure a high level of
+ quality, protect your data by making a backup as you would for
+ any software beta release. Please refer to our bug database at
+ <ulink url="http://bugs.mysql.com/"/> for more details about the
+ individual bugs fixed in this version.
+ </para>
+ </note>
<para>
Bugs fixed:
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8067 - in trunk: . refman-5.0 refman-5.1 refman-common | paul | 12 Oct |
