Author: paul
Date: 2008-08-15 20:11:19 +0200 (Fri, 15 Aug 2008)
New Revision: 11568
Log:
r33391@frost: paul | 2008-08-15 13:09:39 -0500
"What about us grils?"
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/command-optvars/mysqlbinlog.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:33361
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32725
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33391
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32725
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2008-08-15 13:55:53 UTC (rev 11567)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2008-08-15 18:11:19 UTC (rev 11568)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 990 bytes
@@ -168,7 +168,7 @@
<para>
Replicating a Falcon table that contained a
- <literal>TEXT</literal> or <literal>BLOG</literal> column would
+ <literal>TEXT</literal> or <literal>BLOB</literal> column would
fail during a <literal>DELETE</literal> operation with the error
<literal>HA_ERR_END_OF_FILE</literal>.
</para>
@@ -17197,7 +17197,7 @@
<message>
<para>
- For a <literal>TERMPORARY</literal> table,
+ For a <literal>TEMPORARY</literal> table,
<literal>DELETE</literal> with no <literal>WHERE</literal>
clause could fail when preceded by <literal>DELETE</literal>
statements with a <literal>WHERE</literal> clause.
Modified: trunk/dynamic-docs/command-optvars/mysqlbinlog.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlbinlog.xml 2008-08-15 13:55:53 UTC (rev 11567)
+++ trunk/dynamic-docs/command-optvars/mysqlbinlog.xml 2008-08-15 18:11:19 UTC (rev 11568)
Changed blocks: 5, Lines Added: 6, Lines Deleted: 7; 1642 bytes
@@ -362,7 +362,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--base64-output" inversion="5.1.5"/>
+ <optype class="cmdline" format="--base64-output"/>
<optype class="mycnf"/>
</types>
@@ -494,8 +494,8 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--hexdump" inversion="5.1.2"/>
- <optype class="cmdline" format="-H" inversion="5.1.2"/>
+ <optype class="cmdline" format="--hexdump"/>
+ <optype class="cmdline" format="-H"/>
<optype class="mycnf"/>
</types>
@@ -659,7 +659,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--server-id=id" inversion="5.1.4"/>
+ <optype class="cmdline" format="--server-id=id"/>
<optype class="mycnf"/>
</types>
@@ -685,8 +685,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--set-charset=charset_name"
- inversion="5.1.12"/>
+ <optype class="cmdline" format="--set-charset=charset_name"/>
<optype class="mycnf"/>
</types>
@@ -698,9 +697,9 @@
<manual version="5.0"/>
<introduced version="5.0.23"/>
<manual version="5.1"/>
+ <introduced version="5.1.12"/>
<manual version="5.2"/>
<manual version="6.0"/>
- <introduced version="5.1.12"/>
</versions>
</mysqloption>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11568 - in trunk: . dynamic-docs/changelog dynamic-docs/command-optvars | paul.dubois | 15 Aug |
