Author: paul
Date: 2008-09-30 19:26:37 +0200 (Tue, 30 Sep 2008)
New Revision: 11924
Log:
r34339@frost: paul | 2008-09-30 12:28:01 -0500
Document bugfix:
Bug#33414: Backup: DDL hangs indefinitely if ongoing backup
(Document backup_wait_timeout system variable)
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-6.0/dba-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:34337
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33355
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:34339
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33355
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2008-09-30 16:53:26 UTC (rev 11923)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2008-09-30 17:26:37 UTC (rev 11924)
Changed blocks: 1, Lines Added: 26, Lines Deleted: 0; 924 bytes
@@ -27945,4 +27945,30 @@
</logentry>
+ <logentry entrytype="feature">
+
+ <tags>
+ <manual type="backup_wait_timeout"/>
+ <manual type="BACKUP DATABASE"/>
+ <manual type="RESTORE"/>
+ </tags>
+
+ <versions>
+ <version ver="6.0.7"/>
+ </versions>
+
+ <message>
+
+ <para>
+ A new session system variable,
+ <literal>backup_wait_timeout</literal>, controls the number of
+ seconds a <literal>BACKUP DATABASE</literal> or
+ <literal>RESTORE</literal> operation waits for a blocked DDL
+ statements before aborting with an error.
+ </para>
+
+ </message>
+
+ </logentry>
+
</changelog>
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2008-09-30 16:53:26 UTC (rev 11923)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2008-09-30 17:26:37 UTC (rev 11924)
Changed blocks: 1, Lines Added: 29, Lines Deleted: 0; 1066 bytes
@@ -5335,6 +5335,35 @@
</mysqloption>
+ <mysqloption section="server" id="backup_wait_timeout">
+
+ <xrefto id="option_mysqld_backup_wait_timeout"/>
+
+ <name>backup_wait_timeout</name>
+
+ <shortdescription lang="en">
+ Number of seconds to wait for blocked DDL statements before aborting
+ </shortdescription>
+
+ <types>
+ <vartype class="system" isdynamic="yes" scope="session"/>
+ </types>
+
+ <values vartype="numeric" platform="all">
+
+ <value default="50"/>
+ <value minimum="0"/>
+ <value maximum="2147483"/>
+
+ </values>
+
+ <versions>
+ <manual version="6.0"/>
+ <introduced version="6.0.7"/>
+ </versions>
+
+ </mysqloption>
+
<mysqloption section="server" id="backupdir">
<xrefto id="option_mysqld_backupdir"/>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-09-30 16:53:26 UTC (rev 11923)
+++ trunk/refman-6.0/dba-core.xml 2008-09-30 17:26:37 UTC (rev 11924)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 0; 931 bytes
@@ -8363,7 +8363,21 @@
</listitem>
<listitem>
+ <para id="option_mysqld_backup_wait_timeout">
+ <literal>BACKUP_WAIT_TIMEOUT</literal>
+ </para>
+
<para>
+ The number of seconds a <literal>BACKUP DATABASE</literal>
+ or <literal>RESTORE</literal> operation waits for a blocked
+ DDL statements before aborting with an error. The default
+ value is 50. A value of 0 means <quote>no timeout.</quote>
+ This variable was added in MySQL 6.0.7.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>BIG_TABLES = {0 | 1}</literal>
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11924 - in trunk: . dynamic-docs/changelog dynamic-docs/command-optvars refman-6.0 | paul.dubois | 30 Sep |