Author: pd221994
Date: 2011-06-09 20:41:17 +0200 (Thu, 09 Jun 2011)
New Revision: 26481
Log:
r48810@dhcp-adc-twvpn-1-vpnpool-10-154-0-52: paul | 2011-06-09 13:34:50 -0500
Add markup
Modified:
svk:merge
trunk/dynamic-docs/changelog/mysqld-1.xml
Property changes on: trunk
___________________________________________________________________
Modified: svk:merge
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 1277 bytes
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2011-06-09 18:41:08 UTC (rev 26480)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2011-06-09 18:41:17 UTC (rev 26481)
Changed blocks: 19, Lines Added: 102, Lines Deleted: 86; 16552 bytes
@@ -15212,11 +15212,12 @@
<message>
<para>
- Attempts to open a valid MERGE table sometimes resulted in a
+ Attempts to open a valid <literal role="se">MERGE</literal>
+ table sometimes resulted in a
<literal role="error">ER_WRONG_MRG_TABLE</literal> error. This
- happened after failure to open an invalid MERGE table had also
- generated an <literal role="error">ER_WRONG_MRG_TABLE</literal>
- error.
+ happened after failure to open an invalid
+ <literal role="se">MERGE</literal> table had also generated an
+ <literal role="error">ER_WRONG_MRG_TABLE</literal> error.
</para>
</message>
@@ -29042,9 +29043,10 @@
The SQL parser did not accept an empty
<literal>UNION=()</literal> clause. This meant that, when there
were no underlying tables specified for a
- <literal>MERGE</literal> table, <literal role="stmt">SHOW CREATE
- TABLE</literal> and <command>mysqldump</command> both output
- statements that could not be executed.
+ <literal role="se">MERGE</literal> table,
+ <literal role="stmt">SHOW CREATE TABLE</literal> and
+ <command>mysqldump</command> both output statements that could
+ not be executed.
</para>
<para>
@@ -29054,9 +29056,10 @@
However, <literal role="stmt">SHOW CREATE TABLE</literal> and
<command>mysqldump</command> do not output the
<literal>UNION=()</literal> clause if there are no underlying
- tables specified for a <literal>MERGE</literal> table. This also
- means it is now possible to remove the underlying tables for a
- <literal>MERGE</literal> table using <literal>ALTER TABLE ...
+ tables specified for a <literal role="se">MERGE</literal> table.
+ This also means it is now possible to remove the underlying
+ tables for a <literal role="se">MERGE</literal> table using
+ <literal role="stmt" condition="alter-table">ALTER TABLE ...
UNION=()</literal>.
</para>
@@ -33609,8 +33612,9 @@
<para>
When doing a <literal role="stmt">DELETE</literal> on a table
that involved a <literal>JOIN</literal> with
- <literal>MyISAM</literal> or <literal>MERGE</literal> tables and
- the <literal>JOIN</literal> referred to the same table, the
+ <literal role="se">MyISAM</literal> or
+ <literal role="se">MERGE</literal> tables and the
+ <literal>JOIN</literal> referred to the same table, the
operation could fail reporting <literal>ERROR 1030 (HY000): Got
error 134 from storage engine</literal>. This was because scans
on the table contents would change because of rows that had
@@ -36399,8 +36403,8 @@
<para>
A number of problems existed in the implementation of
- <literal>MERGE</literal> tables that could cause problems. The
- problems are summarized below:
+ <literal role="se">MERGE</literal> tables that could cause
+ problems. The problems are summarized below:
</para>
<itemizedlist>
@@ -36410,15 +36414,16 @@
Bug#26379 - Combination of
<literal role="stmt" condition="flush">FLUSH TABLE</literal>
and <literal role="stmt">REPAIR TABLE</literal> corrupts a
- <literal>MERGE</literal> table. This was caused in a number
- of situations:
+ <literal role="se">MERGE</literal> table. This was caused in
+ a number of situations:
</para>
<orderedlist>
<listitem>
<para>
- A thread trying to lock a <literal>MERGE</literal> table
- performs busy waiting while <literal role="stmt">REPAIR
+ A thread trying to lock a
+ <literal role="se">MERGE</literal> table performs busy
+ waiting while <literal role="stmt">REPAIR
TABLE</literal> or a similar table administration task
is ongoing on one or more of its
<literal>MyISAM</literal> tables.
@@ -36427,8 +36432,9 @@
<listitem>
<para>
- A thread trying to lock a <literal>MERGE</literal> table
- performs busy waiting until all threads that did
+ A thread trying to lock a
+ <literal role="se">MERGE</literal> table performs busy
+ waiting until all threads that did
<literal role="stmt">REPAIR TABLE</literal> or similar
table administration tasks on one or more of its
<literal>MyISAM</literal> tables in
@@ -36447,8 +36453,9 @@
Two <literal role="stmt" condition="flush">FLUSH
TABLES</literal> within a <literal role="stmt">LOCK
TABLES</literal> segment can invalidate the lock. This
- does not require a <literal>MERGE</literal> table. The
- first <literal role="stmt" condition="flush">FLUSH
+ does not require a <literal role="se">MERGE</literal>
+ table. The first
+ <literal role="stmt" condition="flush">FLUSH
TABLES</literal> can be replaced by any statement that
requires other threads to reopen the table. In 5.0 and
5.1 a single
@@ -36465,25 +36472,26 @@
Bug#26867 - Simultaneously executing
<literal role="stmt">LOCK TABLES</literal> and
<literal role="stmt">REPAIR TABLE</literal> on a
- <literal>MERGE</literal> table would result in memory/cpu
- hogging.
+ <literal role="se">MERGE</literal> table would result in
+ memory/cpu hogging.
</para>
<para>
- Trying DML on a <literal>MERGE</literal> table, which has a
- child locked and repaired by another thread, made an
- infinite loop in the server.
+ Trying DML on a <literal role="se">MERGE</literal> table,
+ which has a child locked and repaired by another thread,
+ made an infinite loop in the server.
</para>
</listitem>
<listitem>
<para>
- Bug#26377 - Deadlock with <literal>MERGE</literal> and
- <literal role="stmt" condition="flush">FLUSH TABLE</literal>
+ Bug#26377 - Deadlock with <literal role="se">MERGE</literal>
+ and <literal role="stmt" condition="flush">FLUSH
+ TABLE</literal>
</para>
<para>
- Locking a <literal>MERGE</literal> table and its children in
- parent-child order and flushing the child deadlocked the
- server.
+ Locking a <literal role="se">MERGE</literal> table and its
+ children in parent-child order and flushing the child
+ deadlocked the server.
</para>
</listitem>
@@ -36493,37 +36501,41 @@
TABLE</literal>
</para>
<para>
- Truncating a <literal>MERGE</literal> child, while the
- <literal>MERGE</literal> table was in use, let the truncate
- fail instead of waiting for the table to become free.
+ Truncating a <literal role="se">MERGE</literal> child, while
+ the <literal role="se">MERGE</literal> table was in use, let
+ the truncate fail instead of waiting for the table to become
+ free.
</para>
</listitem>
<listitem>
<para>
- Bug#25700 - <literal>MERGE</literal> base tables get
- corrupted by <literal role="stmt">OPTIMIZE TABLE</literal>,
- <literal role="stmt">ANALYZE TABLE</literal>, or
- <literal role="stmt">REPAIR TABLE</literal>.
+ Bug#25700 - <literal role="se">MERGE</literal> base tables
+ get corrupted by <literal role="stmt">OPTIMIZE
+ TABLE</literal>, <literal role="stmt">ANALYZE
+ TABLE</literal>, or <literal role="stmt">REPAIR
+ TABLE</literal>.
</para>
<para>
- Repairing a child of an open <literal>MERGE</literal> table
- corrupted the child. It was necessary to
+ Repairing a child of an open
+ <literal role="se">MERGE</literal> table corrupted the
+ child. It was necessary to
<literal role="stmt">FLUSH</literal> the child first.
</para>
</listitem>
<listitem>
<para>
- Bug#30275 - <literal>MERGE</literal> tables:
+ Bug#30275 - <literal role="se">MERGE</literal> tables:
<literal role="stmt" condition="flush">FLUSH
TABLES</literal> or
<literal role="stmt" condition="lock-tables">UNLOCK
TABLES</literal> causes server to crash.
</para>
<para>
- Flushing and optimizing locked <literal>MERGE</literal>
- children crashed the server.
+ Flushing and optimizing locked
+ <literal role="se">MERGE</literal> children crashed the
+ server.
</para>
</listitem>
@@ -36532,31 +36544,32 @@
Bug#19627 - temporary merge table locking
</para>
<para>
- Use of a temporary <literal>MERGE</literal> table with
- nontemporary children could corrupt the children.
+ Use of a temporary <literal role="se">MERGE</literal> table
+ with nontemporary children could corrupt the children.
</para>
<para>
Temporary tables are never locked. Creation of tables with
nontemporary children of a temporary
- <literal>MERGE</literal> table is now prohibited.
+ <literal role="se">MERGE</literal> table is now prohibited.
</para>
</listitem>
<listitem>
<para>
Bug#27660 - <literal>Falcon</literal>:
- <literal>MERGE</literal> table possible
+ <literal role="se">MERGE</literal> table possible
</para>
<para>
- It was possible to create a <literal>MERGE</literal> table
- with non-<literal>MyISAM</literal> children.
+ It was possible to create a
+ <literal role="se">MERGE</literal> table with
+ non-<literal>MyISAM</literal> children.
</para>
</listitem>
<listitem>
<para>
- Bug#30273 - <literal>MERGE</literal> tables: Can't lock file
- (errno: 155)
+ Bug#30273 - <literal role="se">MERGE</literal> tables: Can't
+ lock file (errno: 155)
</para>
<para>
This was a Windows-only bug. Table administration statements
@@ -36575,18 +36588,18 @@
<listitem>
<para>
This patch changes the behavior of temporary
- <literal>MERGE</literal> tables. Temporary
- <literal>MERGE</literal> must have temporary children. The
- old behavior was wrong. A temporary table is not locked.
- Hence even nontemporary children were not locked. See Bug
- #19627.
+ <literal role="se">MERGE</literal> tables. Temporary
+ <literal role="se">MERGE</literal> must have temporary
+ children. The old behavior was wrong. A temporary table is
+ not locked. Hence even nontemporary children were not
+ locked. See Bug #19627.
</para>
</listitem>
<listitem>
<para>
You cannot change the union list of a nontemporary
- <literal>MERGE</literal> table when
+ <literal role="se">MERGE</literal> table when
<literal role="stmt">LOCK TABLES</literal> is in effect. The
following does <emphasis>not</emphasis> work:
<programlisting>
@@ -36595,19 +36608,19 @@
ALTER TABLE m1 ... UNION=(t1,t2) ...;
</programlisting>
However, you can do this with a temporary
- <literal>MERGE</literal> table.
+ <literal role="se">MERGE</literal> table.
</para>
</listitem>
<listitem>
<para>
- You cannot create a <literal>MERGE</literal> table with
- <literal>CREATE ... SELECT</literal>, neither as a temporary
- <literal>MERGE</literal> table, nor as a nontemporary
- <literal>MERGE</literal> table. For example, <literal>CREATE
- TABLE m1 ... ENGINE=MRG_MYISAM ... SELECT ...;</literal>
- causes the error message: <errortext>table is not BASE
- TABLE</errortext>.
+ You cannot create a <literal role="se">MERGE</literal> table
+ with <literal>CREATE ... SELECT</literal>, neither as a
+ temporary <literal role="se">MERGE</literal> table, nor as a
+ nontemporary <literal role="se">MERGE</literal> table. For
+ example, <literal>CREATE TABLE m1 ... ENGINE=MRG_MYISAM ...
+ SELECT ...;</literal> causes the error message:
+ <errortext>table is not BASE TABLE</errortext>.
</para>
</listitem>
@@ -46967,9 +46980,10 @@
<message>
<para>
- The <literal>MERGE</literal> storage engine did a table scan for
- <literal>SELECT COUNT(*)</literal> statements when it could
- calculate the number of records from the underlying tables.
+ The <literal role="se">MERGE</literal> storage engine did a
+ table scan for <literal>SELECT COUNT(*)</literal> statements
+ when it could calculate the number of records from the
+ underlying tables.
</para>
</message>
@@ -50234,10 +50248,10 @@
<message>
<para>
- Accessing a <literal>MERGE</literal> table with an empty
- underlying table list incorrectly resulted in a <quote>wrong
- index</quote> error message rather than <quote>end of
- file.</quote>
+ Accessing a <literal role="se">MERGE</literal> table with an
+ empty underlying table list incorrectly resulted in a
+ <quote>wrong index</quote> error message rather than <quote>end
+ of file.</quote>
</para>
</message>
@@ -50879,9 +50893,10 @@
<para>
Drivers are now included for storage engines that do not
store any data or rely on other storage engines for data
- storage: <literal>MERGE</literal>,
- <literal>FEDERATED</literal>, <literal>BLACKHOLE</literal>,
- <literal>EXAMPLE</literal>.
+ storage: <literal role="se">MERGE</literal>,
+ <literal role="se">FEDERATED</literal>,
+ <literal role="se">BLACKHOLE</literal>,
+ <literal role="se">EXAMPLE</literal>.
</para>
</listitem>
@@ -65564,10 +65579,11 @@
<message>
<para>
- If the tables underlying a <literal>MERGE</literal> table had a
- primary key but the <literal>MERGE</literal> table itself did
- not, inserting a duplicate row into the <literal>MERGE</literal>
- table caused a server crash.
+ If the tables underlying a <literal role="se">MERGE</literal>
+ table had a primary key but the
+ <literal role="se">MERGE</literal> table itself did not,
+ inserting a duplicate row into the
+ <literal role="se">MERGE</literal> table caused a server crash.
</para>
</message>
@@ -74652,10 +74668,10 @@
<message>
<para>
- Selecting from a <literal>MERGE</literal> table with a corrupted
- child <literal>MyISAM</literal> table could cause a server crash
- when the server attempted to automatically repair the child
- table.
+ Selecting from a <literal role="se">MERGE</literal> table with a
+ corrupted child <literal role="se">MyISAM</literal> table could
+ cause a server crash when the server attempted to automatically
+ repair the child table.
</para>
</message>
@@ -74681,8 +74697,8 @@
<para>
The server could crash if an attempt to open a
- <literal>MERGE</literal> table child <literal>MyISAM</literal>
- table failed.
+ <literal role="se">MERGE</literal> table child
+ <literal role="se">MyISAM</literal> table failed.
</para>
</message>
| Thread |
|---|
| • svn commit - mysqldoc@oter02: r26481 - in trunk: . dynamic-docs/changelog | paul.dubois | 9 Jun |
