List:Commits« Previous MessageNext Message »
From:paul Date:February 15 2006 5:01pm
Subject:svn commit - mysqldoc@docsrva: r1331 - in trunk: . refman-5.1
View as plain text  
Author: paul
Date: 2006-02-15 18:01:11 +0100 (Wed, 15 Feb 2006)
New Revision: 1331

Log:
 r3079@kite-hub:  paul | 2006-02-14 20:22:51 -0600
 Update error messages.


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


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7512
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3045
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7512
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3079

Modified: trunk/refman-5.1/errmsgs-server.xml
===================================================================
--- trunk/refman-5.1/errmsgs-server.xml	2006-02-15 16:13:05 UTC (rev 1330)
+++ trunk/refman-5.1/errmsgs-server.xml	2006-02-15 17:01:11 UTC (rev 1331)
@@ -5963,11 +5963,12 @@
   <listitem>
     <para>
       Error: <literal>1525</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_EVENT_COL_COUNT_DOESNT_MATCH</literal>)
+      (<literal>ER_COL_COUNT_DOESNT_MATCH_CORRUPTED</literal>)
     </para>
 
     <para>
-      Message: Column count of %s.%s is wrong. Table probably corrupted
+      Message: Column count of mysql.%s is wrong. Expected %d, found %d.
+      Table probably corrupted
     </para>
   </listitem>
 
@@ -5978,7 +5979,8 @@
     </para>
 
     <para>
-      Message: Cannot load from mysql.event. Table probably corrupted
+      Message: Cannot load from mysql.%s. Table probably corrupted. See
+      error log.
     </para>
   </listitem>
 
@@ -6085,5 +6087,18 @@
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      Error: <literal>1536</literal> SQLSTATE: <literal>HY000</literal>
+      (<literal>ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE</literal>)
+    </para>
+
+    <para>
+      Message: Column count of mysql.%s is wrong. Expected %d, found %d.
+      Created with MySQL %d, now running %d. Please use
+      scripts/mysql_fix_privilege_tables
+    </para>
+  </listitem>
+
 </itemizedlist>
 <!-- END_OF_SERVER_ERROR_INFO -->

Thread
svn commit - mysqldoc@docsrva: r1331 - in trunk: . refman-5.1paul15 Feb