Author: paul
Date: 2010-03-07 19:55:13 +0100 (Sun, 07 Mar 2010)
New Revision: 19442
Log:
r56607@frost: paul | 2010-03-07 12:53:36 -0500
Add Celosia changes to 5.5 manual
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/changelog/mysqld-2.xml
trunk/refman-5.0/sql-syntax-compound-statements.xml
trunk/refman-5.1/sql-syntax-compound-statements.xml
trunk/refman-5.4/sql-syntax-compound-statements.xml
trunk/refman-5.5/Notes
trunk/refman-5.5/internationalization.xml
trunk/refman-5.5/sql-syntax-compound-statements.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:37300
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:56605
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:37300
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:56607
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2010-03-07 12:58:11 UTC (rev 19441)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2010-03-07 18:55:13 UTC (rev 19442)
Changed blocks: 18, Lines Added: 21, Lines Deleted: 19; 3255 bytes
@@ -591,7 +591,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.14"/>
</versions>
@@ -6523,8 +6523,8 @@
</bugs>
<versions>
- <version ver="5.4.4"/>
- <version ver="5.6.0"/>
+<!--<version ver="5.4.4"/>-->
+ <version ver="5.5.3"/>
<version ver="6.0.14"/>
</versions>
@@ -7889,7 +7889,7 @@
<versions>
<version ver="5.1.35-ndb-7.0.7"/>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.14"/>
</versions>
@@ -12057,7 +12057,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.12"/>
</versions>
@@ -16966,7 +16966,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.10"/>
</versions>
@@ -43521,7 +43521,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.7"/>
</versions>
@@ -45435,7 +45435,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.6"/>
</versions>
@@ -54616,7 +54616,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.7"/>
</versions>
@@ -55743,7 +55743,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.9"/>
</versions>
@@ -57612,7 +57612,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.9"/>
</versions>
@@ -59954,7 +59954,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.10"/>
</versions>
@@ -60085,7 +60085,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.10"/>
</versions>
@@ -61027,7 +61027,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.10"/>
</versions>
@@ -66372,7 +66372,7 @@
<versions>
<version ver="6.0.12"/>
<version ver="6.0.14"/>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
</versions>
<message>
@@ -69310,7 +69310,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.12"/>
</versions>
@@ -69365,7 +69365,7 @@
<versions>
<!--<version ver="5.4.4"/>-->
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.12"/>
</versions>
@@ -73347,7 +73347,9 @@
</bugs>
<versions>
- <version ver="5.4.4"/>
+<!--<version ver="5.4.4"/>-->
+ <version ver="5.5.3"/>
+ <version ver="6.0.14"/>
</versions>
<message>
@@ -80794,7 +80796,7 @@
</bugs>
<versions>
- <version ver="5.6.0"/>
+ <version ver="5.5.3"/>
<version ver="6.0.14"/>
</versions>
Modified: trunk/dynamic-docs/changelog/mysqld-2.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-2.xml 2010-03-07 12:58:11 UTC (rev 19441)
+++ trunk/dynamic-docs/changelog/mysqld-2.xml 2010-03-07 18:55:13 UTC (rev 19442)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 405 bytes
@@ -7189,6 +7189,7 @@
</bugs>
<versions>
+ <version ver="5.5.3"/>
<version ver="6.0.14"/>
</versions>
Modified: trunk/refman-5.0/sql-syntax-compound-statements.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-compound-statements.xml 2010-03-07 12:58:11 UTC (rev 19441)
+++ trunk/refman-5.0/sql-syntax-compound-statements.xml 2010-03-07 18:55:13 UTC (rev 19442)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 822 bytes
@@ -1249,7 +1249,7 @@
<literal role="stmt" condition="case-statement">CASE</literal>
<emphasis>statement</emphasis> used inside stored programs
differs slightly from that of the SQL
- <literal role="stmt" condition="case-statement">CASE</literal>
+ <literal role="op">CASE</literal>
<emphasis>expression</emphasis> described in
<xref linkend="control-flow-functions"/>. The
<literal role="stmt" condition="case-statement">CASE</literal>
Modified: trunk/refman-5.1/sql-syntax-compound-statements.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-compound-statements.xml 2010-03-07 12:58:11 UTC (rev 19441)
+++ trunk/refman-5.1/sql-syntax-compound-statements.xml 2010-03-07 18:55:13 UTC (rev 19442)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1298 bytes
@@ -30,7 +30,7 @@
<literal role="stmt" condition="begin-end">BEGIN ... END</literal>
compound statement and other statements that can be used in the body
of stored programs: Stored procedures and functions, triggers, and
- events. These objects are defined in terms of of SQL code that is
+ events. These objects are defined in terms of SQL code that is
stored on the server for later invocation (see
<xref linkend="stored-programs-views"/>).
</para>
@@ -1257,7 +1257,7 @@
<literal role="stmt" condition="case-statement">CASE</literal>
<emphasis>statement</emphasis> used inside stored programs
differs slightly from that of the SQL
- <literal role="stmt" condition="case-statement">CASE</literal>
+ <literal role="op">CASE</literal>
<emphasis>expression</emphasis> described in
<xref linkend="control-flow-functions"/>. The
<literal role="stmt" condition="case-statement">CASE</literal>
Modified: trunk/refman-5.4/sql-syntax-compound-statements.xml
===================================================================
--- trunk/refman-5.4/sql-syntax-compound-statements.xml 2010-03-07 12:58:11 UTC (rev 19441)
+++ trunk/refman-5.4/sql-syntax-compound-statements.xml 2010-03-07 18:55:13 UTC (rev 19442)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1298 bytes
@@ -30,7 +30,7 @@
<literal role="stmt" condition="begin-end">BEGIN ... END</literal>
compound statement and other statements that can be used in the body
of stored programs: Stored procedures and functions, triggers, and
- events. These objects are defined in terms of of SQL code that is
+ events. These objects are defined in terms of SQL code that is
stored on the server for later invocation (see
<xref linkend="stored-programs-views"/>).
</para>
@@ -1252,7 +1252,7 @@
<literal role="stmt" condition="case-statement">CASE</literal>
<emphasis>statement</emphasis> used inside stored programs
differs slightly from that of the SQL
- <literal role="stmt" condition="case-statement">CASE</literal>
+ <literal role="op">CASE</literal>
<emphasis>expression</emphasis> described in
<xref linkend="control-flow-functions"/>. The
<literal role="stmt" condition="case-statement">CASE</literal>
Modified: trunk/refman-5.5/Notes
===================================================================
--- trunk/refman-5.5/Notes 2010-03-07 12:58:11 UTC (rev 19441)
+++ trunk/refman-5.5/Notes 2010-03-07 18:55:13 UTC (rev 19442)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 2; 958 bytes
@@ -59,6 +59,11 @@
has been stripped. It needs to be added from the 6.0 manual if/when
WEIGHT_STRING() goes into 5.5.
+Unicode error messages, client character set autodetection.
+(This is in 5.5, has it merged up to 6.0?)
+
+4-byte Unicode is in 5.5, but implemented differently from 6.0.
+
Need to figure out version stuff for leap seconds.
For index comments, don't I need to modify the syntax descriptions
@@ -70,8 +75,6 @@
Celosia bugs that will require changes in body of manual
#24690: stored routine var declarations - affects CREATE PROCEDURE
-#37129: <i> rule for user-defined collations
-(pull text from 6.0 manual)
#41371 sql_auto_is_null default value change
(pull text from 6.0 manual)
#48048 Removal of deprecated constructs
Modified: trunk/refman-5.5/internationalization.xml
===================================================================
--- trunk/refman-5.5/internationalization.xml 2010-03-07 12:58:11 UTC (rev 19441)
+++ trunk/refman-5.5/internationalization.xml 2010-03-07 18:55:13 UTC (rev 19442)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1114 bytes
@@ -89,8 +89,7 @@
according to a variety of collations. You can specify character
sets at the server, database, table, and column level. MySQL
supports the use of character sets for the
- <literal>MyISAM</literal>, <literal>MEMORY</literal>,
- <literal role="se">NDBCLUSTER</literal>, and
+ <literal>MyISAM</literal>, <literal>MEMORY</literal>, and
<literal>InnoDB</literal> storage engines.
</para>
@@ -7697,8 +7696,9 @@
</programlisting>
<para>
- Identity rules are supported as of MySQL 5.5. Prior to 5.5,
- use <literal><s> ... </s></literal> instead.
+ Identity rules are supported as of MySQL 5.5.3. Prior to
+ 5.5.3, use <literal><s> ... </s></literal>
+ instead.
</para>
</listitem>
Modified: trunk/refman-5.5/sql-syntax-compound-statements.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-compound-statements.xml 2010-03-07 12:58:11 UTC (rev 19441)
+++ trunk/refman-5.5/sql-syntax-compound-statements.xml 2010-03-07 18:55:13 UTC (rev 19442)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1298 bytes
@@ -30,7 +30,7 @@
<literal role="stmt" condition="begin-end">BEGIN ... END</literal>
compound statement and other statements that can be used in the body
of stored programs: Stored procedures and functions, triggers, and
- events. These objects are defined in terms of of SQL code that is
+ events. These objects are defined in terms of SQL code that is
stored on the server for later invocation (see
<xref linkend="stored-programs-views"/>).
</para>
@@ -1252,7 +1252,7 @@
<literal role="stmt" condition="case-statement">CASE</literal>
<emphasis>statement</emphasis> used inside stored programs
differs slightly from that of the SQL
- <literal role="stmt" condition="case-statement">CASE</literal>
+ <literal role="op">CASE</literal>
<emphasis>expression</emphasis> described in
<xref linkend="control-flow-functions"/>. The
<literal role="stmt" condition="case-statement">CASE</literal>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r19442 - in trunk: . dynamic-docs/changelog refman-5.0 refman-5.1 refman-5.4 refman-5.5 | paul.dubois | 7 Mar |
