Author: jrussell
Date: 2010-12-09 20:20:04 +0100 (Thu, 09 Dec 2010)
New Revision: 24361
Log:
Revert some changes to option defaults that were backed out, per bug #54702.
Modified:
trunk/innodb-1.1/innodb-compression.xml
Modified: trunk/innodb-1.1/innodb-compression.xml
===================================================================
--- trunk/innodb-1.1/innodb-compression.xml 2010-12-09 18:36:20 UTC (rev 24360)
+++ trunk/innodb-1.1/innodb-compression.xml 2010-12-09 19:20:04 UTC (rev 24361)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 10; 1829 bytes
@@ -166,12 +166,10 @@
To use compression, enable the <quote>file per table</quote>
mode using the configuration parameter &innodb_file_per_table;
and enable the &q.barracuda; disk file format using the
- parameter &innodb_file_format;. (Both of these settings are
- enabled by default in MySQL 5.5.5 and up.) If necessary, you can
- set these parameters in the &mysql; option file
- <literal>my.cnf</literal> or <literal>my.ini</literal>, or with
- the <literal>SET</literal> statement without shutting down the
- &mysql; server.
+ parameter &innodb_file_format;. If necessary, you can set these
+ parameters in the &mysql; option file <literal>my.cnf</literal>
+ or <literal>my.ini</literal>, or with the <literal>SET</literal>
+ statement without shutting down the &mysql; server.
</para>
<para>
@@ -462,10 +460,9 @@
When &innodb; strict mode is ON
(<literal>innodb_strict_mode=1</literal>), the &innodb_plugin;
rejects invalid &row_format; or &key_block_size; parameters. For
- compatibility with the &builtin;, &innodb; strict mode is not
- enabled by default, and in this default non-strict mode, the
- &innodb_plugin; issues warnings (not errors) for ignored invalid
- parameters.
+ compatibility with earlier versions of InnoDB,, &innodb; strict
+ mode is not enabled by default; instead, InnoDB issues warnings
+ (not errors) for ignored invalid parameters.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r24361 - trunk/innodb-1.1 | john.russell | 9 Dec |
