Author: jstephens
Date: 2008-02-20 20:55:12 +0100 (Wed, 20 Feb 2008)
New Revision: 9950
Log:
Fixed merged conflict; reformat
Modified:
trunk/refman-5.0/programs-admin-util-core.xml
trunk/refman-5.0/programs-client-core.xml
trunk/refman-5.0/programs-server-core.xml
trunk/refman-5.0/stored-procedures.xml
trunk/refman-5.1/language-structure-core.xml
trunk/refman-5.1/programs-admin-util-core.xml
trunk/refman-5.1/programs-server-core.xml
trunk/refman-5.1/se-csv.xml
trunk/refman-5.1/stored-procedures.xml
trunk/refman-6.0/programs-admin-util-core.xml
trunk/refman-6.0/programs-server-core.xml
trunk/refman-6.0/se-csv.xml
trunk/refman-6.0/se-falcon-core.xml
Modified: trunk/refman-5.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.0/programs-admin-util-core.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-5.0/programs-admin-util-core.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 449 bytes
@@ -5,7 +5,6 @@
]>
<section id="programs-admin-utils">
-
<title>MySQL Administrative and Utility Programs</title>
<remark role="dynamic-dependency-list"/>
Modified: trunk/refman-5.0/programs-client-core.xml
===================================================================
--- trunk/refman-5.0/programs-client-core.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-5.0/programs-client-core.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 392 bytes
@@ -5,7 +5,6 @@
]>
<section id="programs-client">
-
<title>MySQL Client Programs</title>
<remark role="todo">
Modified: trunk/refman-5.0/programs-server-core.xml
===================================================================
--- trunk/refman-5.0/programs-server-core.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-5.0/programs-server-core.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 397 bytes
@@ -5,7 +5,6 @@
]>
<section id="programs-server">
-
<title>MySQL Server and Server-Startup Programs</title>
<para>
Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-5.0/stored-procedures.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 962 bytes
@@ -525,11 +525,11 @@
</para>
<para>
- In versions prior to 5.0.44-sp1,
- the <literal>DETERMINISTIC</literal> characteristic
- is accepted, but not used by the optimizer. However, if
- binary logging is enabled, this characteristic always affects which
- routine definitions MySQL accepts. See
+ In versions prior to 5.0.44-sp1, the
+ <literal>DETERMINISTIC</literal> characteristic is accepted, but
+ not used by the optimizer. However, if binary logging is
+ enabled, this characteristic always affects which routine
+ definitions MySQL accepts. See
<xref linkend="stored-procedure-logging"/>.
</para>
Modified: trunk/refman-5.1/language-structure-core.xml
===================================================================
--- trunk/refman-5.1/language-structure-core.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-5.1/language-structure-core.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 457 bytes
@@ -8,6 +8,7 @@
<title>Language Structure</title>
<remark role="help-category" condition="Language Structure"/>
+
<remark role="dynamic-dependency-list"/>
<para>
Modified: trunk/refman-5.1/programs-admin-util-core.xml
===================================================================
--- trunk/refman-5.1/programs-admin-util-core.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-5.1/programs-admin-util-core.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 449 bytes
@@ -5,7 +5,6 @@
]>
<section id="programs-admin-utils">
-
<title>MySQL Administrative and Utility Programs</title>
<remark role="dynamic-dependency-list"/>
Modified: trunk/refman-5.1/programs-server-core.xml
===================================================================
--- trunk/refman-5.1/programs-server-core.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-5.1/programs-server-core.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 444 bytes
@@ -5,9 +5,8 @@
]>
<section id="programs-server">
-
<title>MySQL Server and Server-Startup Programs</title>
-
+
<remark role="dynamic-dependency-list"/>
<para>
Modified: trunk/refman-5.1/se-csv.xml
===================================================================
--- trunk/refman-5.1/se-csv.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-5.1/se-csv.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 520 bytes
@@ -193,7 +193,7 @@
5.1.12, it is no longer possible to create partitioned
<literal>CSV</literal> tables. (See Bug #19307)
</para>
-
+
<para>
Beginning with MySQL 5.1.23, tables using the
<literal>CSV</literal> storage engine can no longer be created
Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-5.1/stored-procedures.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 964 bytes
@@ -516,11 +516,11 @@
</para>
<para>
- In versions prior to 5.1.21-beta,
- the <literal>DETERMINISTIC</literal> characteristic
- is accepted, but not used by the optimizer. However, if
- binary logging is enabled, this characteristic always affects which
- routine definitions MySQL accepts. See
+ In versions prior to 5.1.21-beta, the
+ <literal>DETERMINISTIC</literal> characteristic is accepted, but
+ not used by the optimizer. However, if binary logging is
+ enabled, this characteristic always affects which routine
+ definitions MySQL accepts. See
<xref linkend="stored-procedure-logging"/>.
</para>
Modified: trunk/refman-6.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-6.0/programs-admin-util-core.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-6.0/programs-admin-util-core.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 449 bytes
@@ -5,7 +5,6 @@
]>
<section id="programs-admin-utils">
-
<title>MySQL Administrative and Utility Programs</title>
<remark role="dynamic-dependency-list"/>
Modified: trunk/refman-6.0/programs-server-core.xml
===================================================================
--- trunk/refman-6.0/programs-server-core.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-6.0/programs-server-core.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 444 bytes
@@ -5,9 +5,8 @@
]>
<section id="programs-server">
-
<title>MySQL Server and Server-Startup Programs</title>
-
+
<remark role="dynamic-dependency-list"/>
<para>
Modified: trunk/refman-6.0/se-csv.xml
===================================================================
--- trunk/refman-6.0/se-csv.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-6.0/se-csv.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 506 bytes
@@ -185,7 +185,7 @@
Partitioning is not supported for tables using the
<literal>CSV</literal> storage engine.
</para>
-
+
<para>
Beginning with MySQL 6.0.5, tables using the
<literal>CSV</literal> storage engine can no longer be created
Modified: trunk/refman-6.0/se-falcon-core.xml
===================================================================
--- trunk/refman-6.0/se-falcon-core.xml 2008-02-20 19:51:19 UTC (rev 9949)
+++ trunk/refman-6.0/se-falcon-core.xml 2008-02-20 19:55:12 UTC (rev 9950)
Changed blocks: 2, Lines Added: 16, Lines Deleted: 4; 2104 bytes
@@ -276,8 +276,17 @@
transaction isolation level.
</para>
-<note><para>If the currently selected transaction isolation level is <literal>read_committed</literal> and you set the transaction isolation level to <literal>serializable</literal> when using a Falcon table then the transaction level will default to repeatable read, ignoring both the new and previous settings.</para>
-</note>
+ <note>
+ <para>
+ If the currently selected transaction isolation level is
+ <literal>read_committed</literal> and you set the
+ transaction isolation level to
+ <literal>serializable</literal> when using a Falcon table
+ then the transaction level will default to repeatable read,
+ ignoring both the new and previous settings.
+ </para>
+ </note>
+
<para>
Default is On.
</para>
@@ -474,11 +483,14 @@
<listitem>
<para id="option_mysqld_falcon_large_blob_threshold">
- <literal>falcon_large_blob_threshold</literal> — BLOB data below this threshold is stored in data pages, instead of BLOB pages. This can improve performance for smaller blobs because only the serial log needs to be flushed at the end of a transaction, and not the serial log and the blob pages.
+ <literal>falcon_large_blob_threshold</literal> — BLOB
+ data below this threshold is stored in data pages, instead of
+ BLOB pages. This can improve performance for smaller blobs
+ because only the serial log needs to be flushed at the end of
+ a transaction, and not the serial log and the blob pages.
</para>
</listitem>
-
<listitem>
<para id ="option_mysqld_falcon_lock_timeout">
<literal>falcon_lock_timeout</literal> — the period (in
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9950 - in trunk: refman-5.0 refman-5.1 refman-6.0 | jon | 20 Feb |
