Author: jdrussel
Date: 2011-06-26 21:31:20 +0200 (Sun, 26 Jun 2011)
New Revision: 26614
Log:
Reword some negative language.
Experimenting with diff/patch techniques for the
smoothest way to backport InnoDB-related wording
changes from 5.6 to 5.5/5.1 where the InnoDB doc
isn't integrated the same way with the Ref Man.
Added:
svn:mergeinfo
Modified:
trunk/innodb-1.1/innodb-compression.xml
trunk/innodb-plugin-1.0/innodb-compression.xml
trunk/refman-5.1/optimization.xml
trunk/refman-5.1/se-innodb-core.xml
trunk/refman-5.5/optimization.xml
trunk/refman-5.5/se-innodb-core.xml
trunk/refman-5.6/innodb-compression.xml
trunk/refman-5.6/optimization.xml
trunk/refman-5.6/se-innodb-core.xml
Property changes on: trunk/refman-5.5/se-innodb-core.xml
___________________________________________________________________
Modified: trunk/innodb-1.1/innodb-compression.xml
===================================================================
--- trunk/innodb-1.1/innodb-compression.xml 2011-06-24 18:49:23 UTC (rev 26613)
+++ trunk/innodb-1.1/innodb-compression.xml 2011-06-26 19:31:20 UTC (rev 26614)
Changed blocks: 3, Lines Added: 15, Lines Deleted: 14; 2901 bytes
@@ -74,11 +74,12 @@
creates a 16KB page in the buffer pool with the uncompressed data.
Within the buffer pool, any updates to the uncompressed page are
also re-written back to the equivalent compressed page. You might
- need to size your buffer pool to accommodate the additional data of
- both compressed and uncompressed pages, although the uncompressed
- pages are <link linkend="glos_eviction">evicted</link> from the
- buffer pool when space is needed, and then uncompressed again on
- the next access.
+ need to size your buffer pool to accommodate the additional data
+ of both compressed and uncompressed pages, although the
+ uncompressed pages are
+ <link linkend="glos_eviction">evicted</link> from the buffer pool
+ when space is needed, and then uncompressed again on the next
+ access.
</para>
</section>
@@ -438,7 +439,7 @@
the error condition with <literal>SHOW ERRORS</literal>. For
example:
- <screen>
+<screen>
mysql> <userinput>CREATE TABLE x (id INT PRIMARY KEY, c INT) </userinput>
-> <userinput>ENGINE=INNODB KEY_BLOCK_SIZE=33333; </userinput>
ERROR 1005 (HY000): Can't create table 'test.x' (errno: 1478)
@@ -1089,14 +1090,14 @@
subsequent <literal>INSERT</literal> or <literal>UPDATE</literal>
statement attempts to create an index entry that does not fit in
the size of the compressed page, the operation fails with
- <literal>ERROR 42000: Row size too large</literal>. Unfortunately,
- this error message does not name the index for which the record is
- too large, or mention the length of the index record or the
- maximum record size on that particular index page. The only remedy
- is to rebuild the table with <literal role="stmt">ALTER
- TABLE</literal>, to select a larger compressed page size
- (<literal>KEY_BLOCK_SIZE</literal>), to shorten any column prefix
- indexes, or to disable compression entirely with
+ <literal>ERROR 42000: Row size too large</literal>. (This error
+ message does not name the index for which the record is too large,
+ or mention the length of the index record or the maximum record
+ size on that particular index page.) To solve this problem,
+ rebuild the table with <literal role="stmt">ALTER TABLE</literal>
+ and select a larger compressed page size
+ (<literal>KEY_BLOCK_SIZE</literal>), shorten any column prefix
+ indexes, or disable compression entirely with
<literal>ROW_FORMAT=DYNAMIC</literal> or
<literal>ROW_FORMAT=COMPACT</literal>.
</para>
Modified: trunk/innodb-plugin-1.0/innodb-compression.xml
===================================================================
--- trunk/innodb-plugin-1.0/innodb-compression.xml 2011-06-24 18:49:23 UTC (rev 26613)
+++ trunk/innodb-plugin-1.0/innodb-compression.xml 2011-06-26 19:31:20 UTC (rev 26614)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 8; 1968 bytes
@@ -385,7 +385,7 @@
description of the error condition with <literal>SHOW
ERRORS</literal>. For example:
- <screen>
+<screen>
mysql> <userinput>CREATE TABLE x (id INT PRIMARY KEY, c INT) </userinput>
-> <userinput>ENGINE=INNODB KEY_BLOCK_SIZE=33333; </userinput>
ERROR 1005 (HY000): Can't create table 'test.x' (errno: 1478)
@@ -1054,13 +1054,14 @@
<literal>UPDATE</literal> statement attempts to create an
index entry that does not fit in the size of the compressed
page, the operation fails with <literal>ERROR 42000: Row size
- too large</literal>. Unfortunately, this error message does
- not name the index for which the record is too large, or
- mention the length of the index record or the maximum record
- size on that particular index page. The only remedy is to
- rebuild the table with &alter_table;, to select a larger
- compressed page size (&key_block_size;), to shorten any column
- prefix indexes, or to disable compression entirely with
+ too large</literal>. (This error message does not name the
+ index for which the record is too large, or mention the length
+ of the index record or the maximum record size on that
+ particular index page.) To solve this problem, rebuild the
+ table with <literal role="stmt">ALTER TABLE</literal> and
+ select a larger compressed page size
+ (<literal>KEY_BLOCK_SIZE</literal>), shorten any column prefix
+ indexes, or disable compression entirely with
&row_format_dynamic; or &row_format_compact;.
</para>
Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml 2011-06-24 18:49:23 UTC (rev 26613)
+++ trunk/refman-5.1/optimization.xml 2011-06-26 19:31:20 UTC (rev 26614)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 4; 1084 bytes
@@ -12424,10 +12424,9 @@
(<literal role="type">VARCHAR</literal>,
<literal role="type">TEXT</literal>, or
<literal role="type">BLOB</literal> columns), a fixed-size
- row format is used. This is faster but unfortunately may
- waste some space. See
- <xref linkend="myisam-table-formats"/>. You can hint that
- you want to have fixed length rows even if you have
+ row format is used. This is faster but may waste some space.
+ See <xref linkend="myisam-table-formats"/>. You can hint
+ that you want to have fixed length rows even if you have
<literal role="type">VARCHAR</literal> columns with the
<literal role="stmt">CREATE TABLE</literal> option
<literal>ROW_FORMAT=FIXED</literal>.
Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml 2011-06-24 18:49:23 UTC (rev 26613)
+++ trunk/refman-5.1/se-innodb-core.xml 2011-06-26 19:31:20 UTC (rev 26614)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 994 bytes
@@ -11289,10 +11289,10 @@
<listitem>
<para>
- Sometimes it would be useful to lock further tables in the
- course of a transaction. Unfortunately,
- <literal role="stmt">LOCK TABLES</literal> in MySQL performs
- an implicit <literal role="stmt">COMMIT</literal> and
+ You cannot lock additional tables in the middle of a
+ transaction, because <literal role="stmt">LOCK
+ TABLES</literal> performs an implicit
+ <literal role="stmt">COMMIT</literal> and
<literal role="stmt" condition="lock-tables">UNLOCK
TABLES</literal>. An <literal>InnoDB</literal> variant of
<literal role="stmt">LOCK TABLES</literal> has been planned
Modified: trunk/refman-5.5/optimization.xml
===================================================================
--- trunk/refman-5.5/optimization.xml 2011-06-24 18:49:23 UTC (rev 26613)
+++ trunk/refman-5.5/optimization.xml 2011-06-26 19:31:20 UTC (rev 26614)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 4; 1082 bytes
@@ -3045,10 +3045,9 @@
(<literal role="type">VARCHAR</literal>,
<literal role="type">TEXT</literal>, or
<literal role="type">BLOB</literal> columns), a fixed-size
- row format is used. This is faster but unfortunately may
- waste some space. See
- <xref linkend="myisam-table-formats"/>. You can hint that
- you want to have fixed length rows even if you have
+ row format is used. This is faster but may waste some space.
+ See <xref linkend="myisam-table-formats"/>. You can hint
+ that you want to have fixed length rows even if you have
<literal role="type">VARCHAR</literal> columns with the
<literal role="stmt">CREATE TABLE</literal> option
<literal>ROW_FORMAT=FIXED</literal>.
Modified: trunk/refman-5.5/se-innodb-core.xml
===================================================================
--- trunk/refman-5.5/se-innodb-core.xml 2011-06-24 18:49:23 UTC (rev 26613)
+++ trunk/refman-5.5/se-innodb-core.xml 2011-06-26 19:31:20 UTC (rev 26614)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 1117 bytes
@@ -12209,10 +12209,10 @@
<listitem>
<para>
- Sometimes it would be useful to lock further tables in the
- course of a transaction. Unfortunately,
- <literal role="stmt">LOCK TABLES</literal> in MySQL performs
- an implicit <literal role="stmt">COMMIT</literal> and
+ You cannot lock additional tables in the middle of a
+ transaction, because <literal role="stmt">LOCK
+ TABLES</literal> performs an implicit
+ <literal role="stmt">COMMIT</literal> and
<literal role="stmt" condition="lock-tables">UNLOCK
TABLES</literal>. An <literal>InnoDB</literal> variant of
<literal role="stmt">LOCK TABLES</literal> has been planned
Property changes on: trunk/refman-5.5/se-innodb-core.xml
___________________________________________________________________
Added: svn:mergeinfo
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 67 bytes
Modified: trunk/refman-5.6/innodb-compression.xml
===================================================================
--- trunk/refman-5.6/innodb-compression.xml 2011-06-24 18:49:23 UTC (rev 26613)
+++ trunk/refman-5.6/innodb-compression.xml 2011-06-26 19:31:20 UTC (rev 26614)
Changed blocks: 3, Lines Added: 15, Lines Deleted: 14; 2901 bytes
@@ -70,11 +70,12 @@
creates a 16KB page in the buffer pool with the uncompressed data.
Within the buffer pool, any updates to the uncompressed page are
also re-written back to the equivalent compressed page. You might
- need to size your buffer pool to accommodate the additional data of
- both compressed and uncompressed pages, although the uncompressed
- pages are <link linkend="glos_eviction">evicted</link> from the
- buffer pool when space is needed, and then uncompressed again on
- the next access.
+ need to size your buffer pool to accommodate the additional data
+ of both compressed and uncompressed pages, although the
+ uncompressed pages are
+ <link linkend="glos_eviction">evicted</link> from the buffer pool
+ when space is needed, and then uncompressed again on the next
+ access.
</para>
</section>
@@ -434,7 +435,7 @@
the error condition with <literal>SHOW ERRORS</literal>. For
example:
- <screen>
+<screen>
mysql> <userinput>CREATE TABLE x (id INT PRIMARY KEY, c INT) </userinput>
-> <userinput>ENGINE=INNODB KEY_BLOCK_SIZE=33333; </userinput>
ERROR 1005 (HY000): Can't create table 'test.x' (errno: 1478)
@@ -1083,14 +1084,14 @@
subsequent <literal>INSERT</literal> or <literal>UPDATE</literal>
statement attempts to create an index entry that does not fit in
the size of the compressed page, the operation fails with
- <literal>ERROR 42000: Row size too large</literal>. Unfortunately,
- this error message does not name the index for which the record is
- too large, or mention the length of the index record or the
- maximum record size on that particular index page. The only remedy
- is to rebuild the table with <literal role="stmt">ALTER
- TABLE</literal>, to select a larger compressed page size
- (<literal>KEY_BLOCK_SIZE</literal>), to shorten any column prefix
- indexes, or to disable compression entirely with
+ <literal>ERROR 42000: Row size too large</literal>. (This error
+ message does not name the index for which the record is too large,
+ or mention the length of the index record or the maximum record
+ size on that particular index page.) To solve this problem,
+ rebuild the table with <literal role="stmt">ALTER TABLE</literal>
+ and select a larger compressed page size
+ (<literal>KEY_BLOCK_SIZE</literal>), shorten any column prefix
+ indexes, or disable compression entirely with
<literal>ROW_FORMAT=DYNAMIC</literal> or
<literal>ROW_FORMAT=COMPACT</literal>.
</para>
Modified: trunk/refman-5.6/optimization.xml
===================================================================
--- trunk/refman-5.6/optimization.xml 2011-06-24 18:49:23 UTC (rev 26613)
+++ trunk/refman-5.6/optimization.xml 2011-06-26 19:31:20 UTC (rev 26614)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 4; 1082 bytes
@@ -3335,10 +3335,9 @@
(<literal role="type">VARCHAR</literal>,
<literal role="type">TEXT</literal>, or
<literal role="type">BLOB</literal> columns), a fixed-size
- row format is used. This is faster but unfortunately may
- waste some space. See
- <xref linkend="myisam-table-formats"/>. You can hint that
- you want to have fixed length rows even if you have
+ row format is used. This is faster but may waste some space.
+ See <xref linkend="myisam-table-formats"/>. You can hint
+ that you want to have fixed length rows even if you have
<literal role="type">VARCHAR</literal> columns with the
<literal role="stmt">CREATE TABLE</literal> option
<literal>ROW_FORMAT=FIXED</literal>.
Modified: trunk/refman-5.6/se-innodb-core.xml
===================================================================
--- trunk/refman-5.6/se-innodb-core.xml 2011-06-24 18:49:23 UTC (rev 26613)
+++ trunk/refman-5.6/se-innodb-core.xml 2011-06-26 19:31:20 UTC (rev 26614)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 4; 1103 bytes
@@ -12952,12 +12952,14 @@
</para>
</listitem>
+<!-- JDR: "has been planned", any news? -->
+
<listitem>
<para>
- Sometimes it would be useful to lock further tables in the
- course of a transaction. Unfortunately,
- <literal role="stmt">LOCK TABLES</literal> in MySQL performs
- an implicit <literal role="stmt">COMMIT</literal> and
+ You cannot lock additional tables in the middle of a
+ transaction, because <literal role="stmt">LOCK
+ TABLES</literal> performs an implicit
+ <literal role="stmt">COMMIT</literal> and
<literal role="stmt" condition="lock-tables">UNLOCK
TABLES</literal>. An <literal>InnoDB</literal> variant of
<literal role="stmt">LOCK TABLES</literal> has been planned
| Thread |
|---|
| • svn commit - mysqldoc@oter02: r26614 - in trunk: innodb-1.1 innodb-plugin-1.0 refman-5.1 refman-5.5 refman-5.6 | john.russell | 27 Jun |
