Author: paul
Date: 2009-05-07 18:07:57 +0200 (Thu, 07 May 2009)
New Revision: 14841
Log:
r40976@frost: paul | 2009-05-07 11:07:46 -0500
Add section for 5.4 reserved words
Fix version numbers in other sections
Modified:
trunk/quick-guides/reservedwords-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:40974
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38062
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:40976
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38062
Modified: trunk/quick-guides/reservedwords-core.xml
===================================================================
--- trunk/quick-guides/reservedwords-core.xml 2009-05-07 16:01:15 UTC (rev 14840)
+++ trunk/quick-guides/reservedwords-core.xml 2009-05-07 16:07:57 UTC (rev 14841)
Changed blocks: 2, Lines Added: 17, Lines Deleted: 3; 1434 bytes
@@ -35,7 +35,7 @@
<title>Reserved Words in MySQL 5.1</title>
<para>
- The following table shows the reserved words in MySQL 5.0.
+ The following table shows the reserved words in MySQL 5.1.
</para>
<para condition="dynamic:reservedwords:detailed" role="5.1"/>
@@ -44,17 +44,31 @@
</section>
+ <section id="mysqld-version-reference-reservedwords-5-4">
+
+ <title>Reserved Words in MySQL 5.4</title>
+
+ <para>
+ The following table shows the reserved words in MySQL 5.4.
+ </para>
+
+ <para condition="dynamic:reservedwords:detailed" role="5.4"/>
+
+ <para condition="dynamic:reservedwords:newwords" role="5.4:5.1"/>
+
+ </section>
+
<section id="mysqld-version-reference-reservedwords-6-0">
<title>Reserved Words in MySQL 6.0</title>
<para>
- The following table shows the reserved words in MySQL 5.0.
+ The following table shows the reserved words in MySQL 6.0.
</para>
<para condition="dynamic:reservedwords:detailed" role="6.0"/>
- <para condition="dynamic:reservedwords:newwords" role="6.0:5.1"/>
+ <para condition="dynamic:reservedwords:newwords" role="6.0:5.4"/>
</section>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r14841 - in trunk: . quick-guides | paul.dubois | 7 May |
