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

[paul]

Author: paul
Date: 2006-04-27 14:11:18 +0200 (Thu, 27 Apr 2006)
New Revision: 1952

Log:
 r7005@polar:  paul | 2006-04-27 07:10:54 -0500
 Update error messages


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


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:6954
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9797
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4590
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:7005
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9797
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4590

Modified: trunk/refman-5.0/errmsgs-server.xml
===================================================================
--- trunk/refman-5.0/errmsgs-server.xml	2006-04-27 03:47:39 UTC (rev 1951)
+++ trunk/refman-5.0/errmsgs-server.xml	2006-04-27 12:11:18 UTC (rev 1952)
@@ -5256,5 +5256,16 @@
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      Error: <literal>1463</literal> SQLSTATE: <literal>42000</literal>
+      (<literal>ER_NON_GROUPING_FIELD_USED</literal>)
+    </para>
+
+    <para>
+      Message: non-grouping field '%s' is used in %s clause
+    </para>
+  </listitem>
+
 </itemizedlist>
 <!-- END_OF_SERVER_ERROR_INFO -->

Modified: trunk/refman-5.1/errmsgs-server.xml
===================================================================
--- trunk/refman-5.1/errmsgs-server.xml	2006-04-27 03:47:39 UTC (rev 1951)
+++ trunk/refman-5.1/errmsgs-server.xml	2006-04-27 12:11:18 UTC (rev 1952)
@@ -6174,104 +6174,104 @@
 
   <listitem>
     <para>
-      Error: <literal>1543</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR</literal>)
+      Error: <literal>1543</literal> SQLSTATE: <literal>42000</literal>
+      (<literal>ER_MAX_PREPARED_STMT_COUNT_REACHED</literal>)
     </para>
 
     <para>
-      Message: Cannot switch out of the row-based binary log format when
-      the session has open temporary tables
+      Message: Can't create more than max_prepared_stmt_count statements
+      (current value: %lu)
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1544</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT</literal>)
+      (<literal>ER_VIEW_RECURSIVE</literal>)
     </para>
 
     <para>
-      Message: Cannot change the binary logging format inside a stored
-      function or trigger
+      Message: `%s`.`%s` contains view recursion
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1545</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_NDB_CANT_SWITCH_BINLOG_FORMAT</literal>)
+      (<literal>ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR</literal>)
     </para>
 
     <para>
-      Message: The NDB cluster engine does not support changing the
-      binlog format on the fly yet
+      Message: Cannot switch out of the row-based binary log format when
+      the session has open temporary tables
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1546</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_PARTITION_NO_TEMPORARY</literal>)
+      (<literal>ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_FORMAT</literal>)
     </para>
 
     <para>
-      Message: Cannot create temporary table with partitions
+      Message: Cannot change the binary logging format inside a stored
+      function or trigger
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1547</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_DDL_LOG_ERROR</literal>)
+      (<literal>ER_NDB_CANT_SWITCH_BINLOG_FORMAT</literal>)
     </para>
 
     <para>
-      Message: Error in DDL log
+      Message: The NDB cluster engine does not support changing the
+      binlog format on the fly yet
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1548</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_NULL_IN_VALUES_LESS_THAN</literal>)
+      (<literal>ER_PARTITION_NO_TEMPORARY</literal>)
     </para>
 
     <para>
-      Message: Not allowed to use NULL value in VALUES LESS THAN
+      Message: Cannot create temporary table with partitions
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1549</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_WRONG_PARTITION_NAME</literal>)
+      (<literal>ER_DDL_LOG_ERROR</literal>)
     </para>
 
     <para>
-      Message: Incorrect partition name
+      Message: Error in DDL log
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1550</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_MAX_PREPARED_STMT_COUNT_REACHED</literal>)
+      Error: <literal>1550</literal> SQLSTATE: <literal>HY000</literal>
+      (<literal>ER_NULL_IN_VALUES_LESS_THAN</literal>)
     </para>
 
     <para>
-      Message: Can't create more than max_prepared_stmt_count statements
-      (current value: %lu)
+      Message: Not allowed to use NULL value in VALUES LESS THAN
     </para>
   </listitem>
 
   <listitem>
     <para>
       Error: <literal>1551</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_VIEW_RECURSIVE</literal>)
+      (<literal>ER_WRONG_PARTITION_NAME</literal>)
     </para>
 
     <para>
-      Message: `%s`.`%s` contain view recursion
+      Message: Incorrect partition name
     </para>
   </listitem>