svn commit - mysqldoc@docsrva: r3510 - in trunk: . refman-5.1

[paul]

Author: paul
Date: 2006-09-29 18:02:30 +0200 (Fri, 29 Sep 2006)
New Revision: 3510

Log:
 r14124@polar:  paul | 2006-09-28 13:49:11 -0500
 Update error messages


Modified:
   trunk/refman-5.1/errmsgs-server.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14099
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:9227
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10466
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14124
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:9227
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10466


Modified: trunk/refman-5.1/errmsgs-server.xml
===================================================================
--- trunk/refman-5.1/errmsgs-server.xml	2006-09-29 12:14:45 UTC (rev 3509)
+++ trunk/refman-5.1/errmsgs-server.xml	2006-09-29 16:02:30 UTC (rev 3510)
Changed blocks: 1, Lines Added: 21, Lines Deleted: 33; 3966 bytes

@@ -6414,116 +6414,104 @@
   <listitem>
     <para>
       Error: <literal>1564</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_ALTER_LOG_TABLE</literal>)
+      (<literal>ER_EVENT_RECURSIVITY_FORBIDDEN</literal>)
     </para>
 
     <para>
-      Message: You can't alter a log table if logging is enabled
+      Message: Recursivity of EVENT DDL statements is forbidden when
+      body is present
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1565</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_BAD_LOG_ENGINE</literal>)
+      (<literal>ER_EVENTS_DB_ERROR</literal>)
     </para>
 
     <para>
-      Message: One can use only CSV and MyISAM engines for the log
-      tables
+      Message: Cannot proceed because the tables used by events were
+      found damaged at server start
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1566</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_DROP_LOG_TABLE</literal>)
+      (<literal>ER_ONLY_INTEGERS_ALLOWED</literal>)
     </para>
 
     <para>
-      Message: Cannot drop log table if log is enabled
+      Message: Only normal integers allowed as number here
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1567</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_EVENT_RECURSIVITY_FORBIDDEN</literal>)
+      (<literal>ER_AUTOINC_READ_FAILED</literal>)
     </para>
 
     <para>
-      Message: Recursivity of EVENT DDL statements is forbidden when
-      body is present
+      Message: Failed to read auto-increment value from storage engine
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1568</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_EVENTS_DB_ERROR</literal>)
+      (<literal>ER_USERNAME</literal>)
     </para>
 
     <para>
-      Message: Cannot proceed because the tables used by events were
-      found damaged at server start
+      Message: user name
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1569</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_ONLY_INTEGERS_ALLOWED</literal>)
+      (<literal>ER_HOSTNAME</literal>)
     </para>
 
     <para>
-      Message: Only normal integers allowed as number here
+      Message: host name
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1570</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_AUTOINC_READ_FAILED</literal>)
+      (<literal>ER_WRONG_STRING_LENGTH</literal>)
     </para>
 
     <para>
-      Message: Failed to read auto-increment value from storage engine
+      Message: String '%s' is too long for %s (should be no longer than
+      %d)
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1571</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_USERNAME</literal>)
+      (<literal>ER_UNSUPORTED_LOG_ENGINE</literal>)
     </para>
 
     <para>
-      Message: user name
+      Message: This storage engine cannot be used for log tables"
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1572</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_HOSTNAME</literal>)
+      (<literal>ER_BAD_LOG_STATEMENT</literal>)
     </para>
 
     <para>
-      Message: host name
+      Message: You cannot '%s' a log table if logging is enabled
     </para>
   </listitem>
 
-  <listitem>
-    <para>
-      Error: <literal>1573</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_WRONG_STRING_LENGTH</literal>)
-    </para>
-
-    <para>
-      Message: String '%s' is too long for %s (should be no longer than
-      %d)
-    </para>
-  </listitem>
-
 </itemizedlist>
 <!-- END_OF_SERVER_ERROR_INFO -->