Author: paul
Date: 2008-11-05 17:48:10 +0100 (Wed, 05 Nov 2008)
New Revision: 12290
Log:
r35301@frost: paul | 2008-11-04 14:22:52 -0500
General InnoDB revisions
Modified:
trunk/refman-4.1/se-innodb-core.xml
trunk/refman-5.0/se-innodb-core.xml
trunk/refman-5.1/se-innodb-core.xml
trunk/refman-6.0/se-innodb-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35298
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34100
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35301
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34100
Modified: trunk/refman-4.1/se-innodb-core.xml
===================================================================
--- trunk/refman-4.1/se-innodb-core.xml 2008-11-05 13:08:08 UTC (rev 12289)
+++ trunk/refman-4.1/se-innodb-core.xml 2008-11-05 16:48:10 UTC (rev 12290)
Changed blocks: 6, Lines Added: 27, Lines Deleted: 24; 4875 bytes
@@ -1242,7 +1242,7 @@
on the command line or as
<literal><replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
in option files. Many of the system variables can be changed at
- runtime (see <xref linkend="using-system-variables"/>). (Before
+ runtime (see <xref linkend="dynamic-system-variables"/>). (Before
MySQL 4.0.2, system variable values should be specified using
<option>--set-variable</option> syntax.) For more information on
specifying options and system variables, see
@@ -1329,7 +1329,7 @@
<para>
Causes <literal>InnoDB</literal> to create a file named
- <filename><replaceable><datadir></replaceable>/innodb_status.<replaceable><pid></replaceable></filename>
+ <filename>innodb_status.<replaceable><pid></replaceable></filename>
in the MySQL data directory. <literal>InnoDB</literal>
periodically writes the output of <literal>SHOW ENGINE INNODB
STATUS</literal> to this file. This option is available as of
@@ -1369,10 +1369,10 @@
<para>
The increment size (in MB) for extending the size of an
- auto-extending tablespace when it becomes full. The default
- value is 8. This variable is available starting from MySQL
- 4.0.24 and 4.1.5. As of MySQL 4.0.24 and 4.1.6, it can be
- changed at runtime as a global system variable.
+ auto-extending tablespace file when it becomes full. The
+ default value is 8. This variable is available starting from
+ MySQL 4.0.24 and 4.1.5. As of MySQL 4.0.24 and 4.1.6, it can
+ be changed at runtime as a global system variable.
</para>
</listitem>
@@ -1383,18 +1383,12 @@
<para>
The size of the buffer pool (in MB), if it is placed in the
- AWE memory. This is relevant only in 32-bit Windows. If your
- 32-bit Windows operating system supports more than 4GB memory,
- using so-called <quote>Address Windowing Extensions,</quote>
- you can allocate the <literal>InnoDB</literal> buffer pool
- into the AWE physical memory using this variable. The maximum
- possible value for this variable is 63000. If it is greater
- than 0, <literal>innodb_buffer_pool_size</literal> is the
- window in the 32-bit address space of
- <command>mysqld</command> where <literal>InnoDB</literal> maps
- that AWE memory. A good value for
- <literal>innodb_buffer_pool_size</literal> is 500MB. This
- variable is available as of MySQL 4.1.0.
+ AWE memory. If it is greater than 0,
+ <literal>innodb_buffer_pool_size</literal> is the window in
+ the 32-bit address space of <command>mysqld</command> where
+ <literal>InnoDB</literal> maps that AWE memory. A good value
+ for <literal>innodb_buffer_pool_size</literal> is 500MB. The
+ maximum possible value for this variable is 63000.
</para>
<para>
@@ -1403,6 +1397,15 @@
this can be found in the
<filename>innobase/os/os0proc.c</filename> source file.
</para>
+
+ <para>
+ This variable is available as of MySQL 4.1.0. It is relevant
+ only in 32-bit Windows. If your 32-bit Windows operating
+ system supports more than 4GB memory, using so-called
+ <quote>Address Windowing Extensions,</quote> you can allocate
+ the <literal>InnoDB</literal> buffer pool into the AWE
+ physical memory using this variable.
+ </para>
</listitem>
<listitem>
@@ -1413,12 +1416,12 @@
<para>
The size in bytes of the memory buffer
<literal>InnoDB</literal> uses to cache data and indexes of
- its tables. The larger you set this value, the less disk I/O
- is needed to access data in tables. On a dedicated database
- server, you may set this to up to 80% of the machine physical
- memory size. However, do not set it too large because
- competition for physical memory might cause paging in the
- operating system.
+ its tables. The default value is 8MB. The larger you set this
+ value, the less disk I/O is needed to access data in tables.
+ On a dedicated database server, you may set this to up to 80%
+ of the machine physical memory size. However, do not set it
+ too large because competition for physical memory might cause
+ paging in the operating system.
</para>
</listitem>
Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml 2008-11-05 13:08:08 UTC (rev 12289)
+++ trunk/refman-5.0/se-innodb-core.xml 2008-11-05 16:48:10 UTC (rev 12290)
Changed blocks: 7, Lines Added: 29, Lines Deleted: 26; 4875 bytes
@@ -1143,7 +1143,7 @@
in option files. For more information on specifying options and
system variables, see <xref linkend="program-options"/>. Many of
the system variables can be changed at runtime (see
- <xref linkend="using-system-variables"/>).
+ <xref linkend="dynamic-system-variables"/>).
</para>
<formalpara role="mnmas">
@@ -1207,7 +1207,7 @@
<para>
Causes <literal>InnoDB</literal> to create a file named
- <filename><replaceable><datadir></replaceable>/innodb_status.<replaceable><pid></replaceable></filename>
+ <filename>innodb_status.<replaceable><pid></replaceable></filename>
in the MySQL data directory. <literal>InnoDB</literal>
periodically writes the output of <literal>SHOW ENGINE INNODB
STATUS</literal> to this file.
@@ -1228,12 +1228,12 @@
</para>
<para>
- Whether InnoDB adaptive hash indexes are enabled or disabled.
- By default, this variable is enabled. Use
+ Whether InnoDB adaptive hash indexes are enabled or disabled
+ (see <xref linkend="innodb-adaptive-hash"/>). This variable is
+ enabled by default. Use
<option>--skip-innodb_adaptive_hash_index</option> at server
- startup to disable it. See
- <xref linkend="innodb-adaptive-hash"/> This variable was added
- in MySQL 5.0.52.
+ startup to disable it. This variable was added in MySQL
+ 5.0.52.
</para>
</listitem>
@@ -1261,8 +1261,8 @@
<para>
The increment size (in MB) for extending the size of an
- auto-extending tablespace when it becomes full. The default
- value is 8.
+ auto-extending tablespace file when it becomes full. The
+ default value is 8.
</para>
</listitem>
@@ -1273,17 +1273,12 @@
<para>
The size of the buffer pool (in MB), if it is placed in the
- AWE memory. This is relevant only in 32-bit Windows. If your
- 32-bit Windows operating system supports more than 4GB memory,
- using so-called <quote>Address Windowing Extensions,</quote>
- you can allocate the <literal>InnoDB</literal> buffer pool
- into the AWE physical memory using this variable. The maximum
- possible value for this variable is 63000. If it is greater
- than 0, <literal>innodb_buffer_pool_size</literal> is the
- window in the 32-bit address space of
- <command>mysqld</command> where <literal>InnoDB</literal> maps
- that AWE memory. A good value for
- <literal>innodb_buffer_pool_size</literal> is 500MB.
+ AWE memory. If it is greater than 0,
+ <literal>innodb_buffer_pool_size</literal> is the window in
+ the 32-bit address space of <command>mysqld</command> where
+ <literal>InnoDB</literal> maps that AWE memory. A good value
+ for <literal>innodb_buffer_pool_size</literal> is 500MB. The
+ maximum possible value is 63000.
</para>
<para>
@@ -1292,6 +1287,14 @@
this can be found in the
<filename>innobase/os/os0proc.c</filename> source file.
</para>
+
+ <para>
+ This variable is relevant only in 32-bit Windows. If your
+ 32-bit Windows operating system supports more than 4GB memory,
+ using so-called <quote>Address Windowing Extensions,</quote>
+ you can allocate the <literal>InnoDB</literal> buffer pool
+ into the AWE physical memory using this variable.
+ </para>
</listitem>
<listitem>
@@ -1302,12 +1305,12 @@
<para>
The size in bytes of the memory buffer
<literal>InnoDB</literal> uses to cache data and indexes of
- its tables. The larger you set this value, the less disk I/O
- is needed to access data in tables. On a dedicated database
- server, you may set this to up to 80% of the machine physical
- memory size. However, do not set it too large because
- competition for physical memory might cause paging in the
- operating system.
+ its tables. The default value is 8MB. The larger you set this
+ value, the less disk I/O is needed to access data in tables.
+ On a dedicated database server, you may set this to up to 80%
+ of the machine physical memory size. However, do not set it
+ too large because competition for physical memory might cause
+ paging in the operating system.
</para>
</listitem>
Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml 2008-11-05 13:08:08 UTC (rev 12289)
+++ trunk/refman-5.1/se-innodb-core.xml 2008-11-05 16:48:10 UTC (rev 12290)
Changed blocks: 8, Lines Added: 30, Lines Deleted: 30; 5472 bytes
@@ -1161,7 +1161,7 @@
in option files. For more information on specifying options and
system variables, see <xref linkend="program-options"/>. Many of
the system variables can be changed at runtime (see
- <xref linkend="using-system-variables"/>).
+ <xref linkend="dynamic-system-variables"/>).
</para>
<formalpara role="mnmas">
@@ -1225,7 +1225,7 @@
<para>
Causes <literal>InnoDB</literal> to create a file named
- <filename><replaceable><datadir></replaceable>/innodb_status.<replaceable><pid></replaceable></filename>
+ <filename>innodb_status.<replaceable><pid></replaceable></filename>
in the MySQL data directory. <literal>InnoDB</literal>
periodically writes the output of <literal>SHOW ENGINE INNODB
STATUS</literal> to this file.
@@ -1246,12 +1246,12 @@
</para>
<para>
- Whether InnoDB adaptive hash indexes are enabled or disabled.
- By default, this variable is enabled. Use
+ Whether InnoDB adaptive hash indexes are enabled or disabled
+ (see <xref linkend="innodb-adaptive-hash"/>). This variable is
+ enabled by default. Use
<option>--skip-innodb_adaptive_hash_index</option> at server
- startup to disable it. See
- <xref linkend="innodb-adaptive-hash"/> This variable was added
- in MySQL 5.1.24.
+ startup to disable it. This variable was added in MySQL
+ 5.1.24.
</para>
</listitem>
@@ -1279,8 +1279,8 @@
<para>
The increment size (in MB) for extending the size of an
- auto-extending tablespace when it becomes full. The default
- value is 8.
+ auto-extending tablespace file when it becomes full. The
+ default value is 8.
</para>
</listitem>
@@ -1291,17 +1291,12 @@
<para>
The size of the buffer pool (in MB), if it is placed in the
- AWE memory. This is relevant only in 32-bit Windows. If your
- 32-bit Windows operating system supports more than 4GB memory,
- using so-called <quote>Address Windowing Extensions,</quote>
- you can allocate the <literal>InnoDB</literal> buffer pool
- into the AWE physical memory using this variable. The maximum
- possible value for this variable is 63000. If it is greater
- than 0, <literal>innodb_buffer_pool_size</literal> is the
- window in the 32-bit address space of
- <command>mysqld</command> where <literal>InnoDB</literal> maps
- that AWE memory. A good value for
- <literal>innodb_buffer_pool_size</literal> is 500MB.
+ AWE memory. If it is greater than 0,
+ <literal>innodb_buffer_pool_size</literal> is the window in
+ the 32-bit address space of <command>mysqld</command> where
+ <literal>InnoDB</literal> maps that AWE memory. A good value
+ for <literal>innodb_buffer_pool_size</literal> is 500MB. The
+ maximum possible value is 63000.
</para>
<para>
@@ -1313,7 +1308,12 @@
</para>
<para>
- This variable was removed in MySQL 5.1.13.
+ This variable was removed in MySQL 5.1.13. Before that, it is
+ relevant only in 32-bit Windows. If your 32-bit Windows
+ operating system supports more than 4GB memory, using
+ so-called <quote>Address Windowing Extensions,</quote> you can
+ allocate the <literal>InnoDB</literal> buffer pool into the
+ AWE physical memory using this variable.
</para>
</listitem>
@@ -1326,9 +1326,9 @@
The locking mode to use for generating auto-increment values.
The allowable values are 0, 1, or 2, for
<quote>traditional</quote>, <quote>consecutive</quote>, or
- <quote>interleaved</quote> lock mode, respectively. The
- characteristics of these modes are described in
- <xref linkend="innodb-auto-increment-handling"/>.
+ <quote>interleaved</quote> lock mode, respectively.
+ <xref linkend="innodb-auto-increment-handling"/>, describes
+ the characteristics of these modes.
</para>
<para>
@@ -1347,12 +1347,12 @@
<para>
The size in bytes of the memory buffer
<literal>InnoDB</literal> uses to cache data and indexes of
- its tables. The larger you set this value, the less disk I/O
- is needed to access data in tables. On a dedicated database
- server, you may set this to up to 80% of the machine physical
- memory size. However, do not set it too large because
- competition for physical memory might cause paging in the
- operating system.
+ its tables. The default value is 8MB. The larger you set this
+ value, the less disk I/O is needed to access data in tables.
+ On a dedicated database server, you may set this to up to 80%
+ of the machine physical memory size. However, do not set it
+ too large because competition for physical memory might cause
+ paging in the operating system.
</para>
</listitem>
Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml 2008-11-05 13:08:08 UTC (rev 12289)
+++ trunk/refman-6.0/se-innodb-core.xml 2008-11-05 16:48:10 UTC (rev 12290)
Changed blocks: 7, Lines Added: 19, Lines Deleted: 20; 4010 bytes
@@ -1136,7 +1136,7 @@
in option files. For more information on specifying options and
system variables, see <xref linkend="program-options"/>. Many of
the system variables can be changed at runtime (see
- <xref linkend="using-system-variables"/>).
+ <xref linkend="dynamic-system-variables"/>).
</para>
<formalpara role="mnmas">
@@ -1152,12 +1152,12 @@
</formalpara>
+ <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-innodb"/>
+
<para>
<literal>InnoDB</literal> command options:
</para>
- <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-innodb"/>
-
<itemizedlist>
<listitem>
@@ -1200,7 +1200,7 @@
<para>
Causes <literal>InnoDB</literal> to create a file named
- <filename><replaceable><datadir></replaceable>/innodb_status.<replaceable><pid></replaceable></filename>
+ <filename>innodb_status.<replaceable><pid></replaceable></filename>
in the MySQL data directory. <literal>InnoDB</literal>
periodically writes the output of <literal>SHOW ENGINE INNODB
STATUS</literal> to this file.
@@ -1221,12 +1221,11 @@
</para>
<para>
- Whether InnoDB adaptive hash indexes are enabled or disabled.
- By default, this variable is enabled. Use
+ Whether InnoDB adaptive hash indexes are enabled or disabled
+ (see <xref linkend="innodb-adaptive-hash"/>). This variable is
+ enabled by default. Use
<option>--skip-innodb_adaptive_hash_index</option> at server
- startup to disable it. See
- <xref linkend="innodb-adaptive-hash"/> This variable was added
- in MySQL 6.0.5.
+ startup to disable it. This variable was added in MySQL 6.0.5.
</para>
</listitem>
@@ -1254,8 +1253,8 @@
<para>
The increment size (in MB) for extending the size of an
- auto-extending tablespace when it becomes full. The default
- value is 8.
+ auto-extending tablespace file when it becomes full. The
+ default value is 8.
</para>
</listitem>
@@ -1268,9 +1267,9 @@
The locking mode to use for generating auto-increment values.
The allowable values are 0, 1, or 2, for
<quote>traditional</quote>, <quote>consecutive</quote>, or
- <quote>interleaved</quote> lock mode, respectively. The
- characteristics of these modes are described in
- <xref linkend="innodb-auto-increment-handling"/>.
+ <quote>interleaved</quote> lock mode, respectively.
+ <xref linkend="innodb-auto-increment-handling"/>, describes
+ the characteristics of these modes.
</para>
<para>
@@ -1287,12 +1286,12 @@
<para>
The size in bytes of the memory buffer
<literal>InnoDB</literal> uses to cache data and indexes of
- its tables. The larger you set this value, the less disk I/O
- is needed to access data in tables. On a dedicated database
- server, you may set this to up to 80% of the machine physical
- memory size. However, do not set it too large because
- competition for physical memory might cause paging in the
- operating system.
+ its tables. The default value is 8MB. The larger you set this
+ value, the less disk I/O is needed to access data in tables.
+ On a dedicated database server, you may set this to up to 80%
+ of the machine physical memory size. However, do not set it
+ too large because competition for physical memory might cause
+ paging in the operating system.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12290 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 5 Nov |