Author: paul
Date: 2006-09-20 18:11:22 +0200 (Wed, 20 Sep 2006)
New Revision: 3403
Log:
r10466@kite-hub: paul | 2006-09-20 11:04:36 -0500
Update reserved word, error message lists
Modified:
trunk/refman-5.0/reservedwords.xml
trunk/refman-5.1/errmsgs-server.xml
trunk/refman-5.1/reservedwords.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:13819
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10300
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:13819
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10466
Modified: trunk/refman-5.0/reservedwords.xml
===================================================================
--- trunk/refman-5.0/reservedwords.xml 2006-09-20 15:38:46 UTC (rev 3402)
+++ trunk/refman-5.0/reservedwords.xml 2006-09-20 16:11:22 UTC (rev 3403)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 11; 1416 bytes
@@ -347,43 +347,38 @@
</row>
<row>
<entry>UPDATE</entry>
- <entry>UPGRADE</entry>
<entry>USAGE</entry>
+ <entry>USE</entry>
</row>
<row>
- <entry>USE</entry>
<entry>USING</entry>
<entry>UTC_DATE</entry>
+ <entry>UTC_TIME</entry>
</row>
<row>
- <entry>UTC_TIME</entry>
<entry>UTC_TIMESTAMP</entry>
<entry>VALUES</entry>
+ <entry>VARBINARY</entry>
</row>
<row>
- <entry>VARBINARY</entry>
<entry>VARCHAR</entry>
<entry>VARCHARACTER</entry>
+ <entry>VARYING</entry>
</row>
<row>
- <entry>VARYING</entry>
<entry>WHEN</entry>
<entry>WHERE</entry>
+ <entry>WHILE</entry>
</row>
<row>
- <entry>WHILE</entry>
<entry>WITH</entry>
<entry>WRITE</entry>
+ <entry>X509</entry>
</row>
<row>
- <entry>X509</entry>
<entry>XOR</entry>
<entry>YEAR_MONTH</entry>
- </row>
- <row>
<entry>ZEROFILL</entry>
- <entry></entry>
- <entry></entry>
</row>
</tbody>
</tgroup>
Modified: trunk/refman-5.1/errmsgs-server.xml
===================================================================
--- trunk/refman-5.1/errmsgs-server.xml 2006-09-20 15:38:46 UTC (rev 3402)
+++ trunk/refman-5.1/errmsgs-server.xml 2006-09-20 16:11:22 UTC (rev 3403)
Changed blocks: 4, Lines Added: 27, Lines Deleted: 3; 1774 bytes
@@ -6448,6 +6448,30 @@
<listitem>
<para>
Error: <literal>1567</literal> SQLSTATE: <literal>HY000</literal>
+ (<literal>ER_EVENT_RECURSIVITY_FORBIDDEN</literal>)
+ </para>
+
+ <para>
+ Message: Recursivity of EVENT DDL statements is forbidden when
+ body is present
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Error: <literal>1568</literal> SQLSTATE: <literal>HY000</literal>
+ (<literal>ER_EVENTS_DB_ERROR</literal>)
+ </para>
+
+ <para>
+ Message: Cannot proceed because the tables used by events were
+ found damaged at server start
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Error: <literal>1569</literal> SQLSTATE: <literal>HY000</literal>
(<literal>ER_ONLY_INTEGERS_ALLOWED</literal>)
</para>
@@ -6458,7 +6482,7 @@
<listitem>
<para>
- Error: <literal>1568</literal> SQLSTATE: <literal>HY000</literal>
+ Error: <literal>1570</literal> SQLSTATE: <literal>HY000</literal>
(<literal>ER_USERNAME</literal>)
</para>
@@ -6469,7 +6493,7 @@
<listitem>
<para>
- Error: <literal>1569</literal> SQLSTATE: <literal>HY000</literal>
+ Error: <literal>1571</literal> SQLSTATE: <literal>HY000</literal>
(<literal>ER_HOSTNAME</literal>)
</para>
@@ -6480,7 +6504,7 @@
<listitem>
<para>
- Error: <literal>1570</literal> SQLSTATE: <literal>HY000</literal>
+ Error: <literal>1572</literal> SQLSTATE: <literal>HY000</literal>
(<literal>ER_WRONG_STRING_LENGTH</literal>)
</para>
Modified: trunk/refman-5.1/reservedwords.xml
===================================================================
--- trunk/refman-5.1/reservedwords.xml 2006-09-20 15:38:46 UTC (rev 3402)
+++ trunk/refman-5.1/reservedwords.xml 2006-09-20 16:11:22 UTC (rev 3403)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 11; 1416 bytes
@@ -352,43 +352,38 @@
</row>
<row>
<entry>UPDATE</entry>
- <entry>UPGRADE</entry>
<entry>USAGE</entry>
+ <entry>USE</entry>
</row>
<row>
- <entry>USE</entry>
<entry>USING</entry>
<entry>UTC_DATE</entry>
+ <entry>UTC_TIME</entry>
</row>
<row>
- <entry>UTC_TIME</entry>
<entry>UTC_TIMESTAMP</entry>
<entry>VALUES</entry>
+ <entry>VARBINARY</entry>
</row>
<row>
- <entry>VARBINARY</entry>
<entry>VARCHAR</entry>
<entry>VARCHARACTER</entry>
+ <entry>VARYING</entry>
</row>
<row>
- <entry>VARYING</entry>
<entry>WHEN</entry>
<entry>WHERE</entry>
+ <entry>WHILE</entry>
</row>
<row>
- <entry>WHILE</entry>
<entry>WITH</entry>
<entry>WRITE</entry>
+ <entry>X509</entry>
</row>
<row>
- <entry>X509</entry>
<entry>XOR</entry>
<entry>YEAR_MONTH</entry>
- </row>
- <row>
<entry>ZEROFILL</entry>
- <entry></entry>
- <entry></entry>
</row>
</tbody>
</tgroup>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r3403 - in trunk: . refman-5.0 refman-5.1 | paul | 20 Sep |
