List:Commits« Previous MessageNext Message »
From:paul.dubois Date:March 12 2011 4:42pm
Subject:svn commit - mysqldoc@oter02: r25366 - in trunk: . dynamic-docs/changelog refman-5.5 refman-5.6
View as plain text  
Author: pd221994
Date: 2011-03-12 17:42:26 +0100 (Sat, 12 Mar 2011)
New Revision: 25366

Log:
 r45858@dhcp-adc-twvpn-1-vpnpool-10-154-12-165:  paul | 2011-03-12 10:41:20 -0500
 Update error messages


Modified:
   svk:merge
   trunk/dynamic-docs/changelog/mysqld-2.xml
   trunk/refman-5.5/errmsgs-server.xml
   trunk/refman-5.6/errmsgs-server.xml

Property changes on: trunk
___________________________________________________________________

Modified: svk:merge
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 1277 bytes


Modified: trunk/dynamic-docs/changelog/mysqld-2.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-2.xml	2011-03-11 17:02:14 UTC (rev 25365)
+++ trunk/dynamic-docs/changelog/mysqld-2.xml	2011-03-12 16:42:26 UTC (rev 25366)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 35; 1342 bytes

@@ -44,41 +44,6 @@
   <logentry entrytype="bug">
 
     <tags>
-      <highlight type="replication"/>
-      <manual type="SHOW SLAVE STATUS"/>
-      <manual type="Last_IO_Error"/>
-      <manual type="Last_SQL_Error"/>
-    </tags>
-
-    <bugs>
-      <fixes bugid="11765599"/>
-      <fixes bugid="58584"/>
-      <seealsobug bugid="43535"/>
-    </bugs>
-
-    <versions>
-      <version ver="5.6.3"/>
-    </versions>
-
-    <message>
-
-      <para>
-        MySQL 5.6.1 added timestamps to the error messages shown in the
-        <literal>Last_IO_Error</literal> and
-        <literal>Last_SQL_Error</literal> columns of the output of
-        <literal role="stmt">SHOW SLAVE STATUS</literal>. Now these
-        timestamps are shown in separate columns of their own, named
-        <literal>Last_IO_Error_Timestamp</literal> and
-        <literal>Last_SQL_Error_Timestamp</literal>, respectively.
-      </para>
-
-    </message>
-
-  </logentry>
-
-  <logentry entrytype="bug">
-
-    <tags>
       <manual type="optimizer"/>
       <manual type="OUTER JOIN"/>
       <manual type="IS NULL"/>


Modified: trunk/refman-5.5/errmsgs-server.xml
===================================================================
--- trunk/refman-5.5/errmsgs-server.xml	2011-03-11 17:02:14 UTC (rev 25365)
+++ trunk/refman-5.5/errmsgs-server.xml	2011-03-12 16:42:26 UTC (rev 25366)
Changed blocks: 1, Lines Added: 24, Lines Deleted: 0; 1086 bytes

@@ -8055,5 +8055,29 @@
     </para>
   </listitem>
 
+  <listitem>
+    <para id="error_er_multi_update_key_conflict">
+      Error: <literal>1706</literal> SQLSTATE: <literal>HY000</literal>
+      (<literal role="error">ER_MULTI_UPDATE_KEY_CONFLICT</literal>)
+    </para>
+
+    <para>
+      Message: Primary key/partition key update is not allowed since the
+      table is updated both as '%s' and '%s'.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para id="error_er_table_needs_rebuild">
+      Error: <literal>1707</literal> SQLSTATE: <literal>HY000</literal>
+      (<literal role="error">ER_TABLE_NEEDS_REBUILD</literal>)
+    </para>
+
+    <para>
+      Message: Table rebuild required. Please do "ALTER TABLE `%s`
+      FORCE" or dump/reload to fix it!
+    </para>
+  </listitem>
+
 </itemizedlist>
 <!-- END_OF_SERVER_ERROR_INFO -->


Modified: trunk/refman-5.6/errmsgs-server.xml
===================================================================
--- trunk/refman-5.6/errmsgs-server.xml	2011-03-11 17:02:14 UTC (rev 25365)
+++ trunk/refman-5.6/errmsgs-server.xml	2011-03-12 16:42:26 UTC (rev 25366)
Changed blocks: 3, Lines Added: 70, Lines Deleted: 2; 2951 bytes

@@ -8113,7 +8113,7 @@
     </para>
 
     <para>
-      Message: Found row that does not match the partition
+      Message: Found a row that does not match the partition
     </para>
   </listitem>
 

@@ -8275,8 +8275,20 @@
   </listitem>
 
   <listitem>
+    <para id="error_er_multi_update_key_conflict">
+      Error: <literal>1725</literal> SQLSTATE: <literal>HY000</literal>
+      (<literal role="error">ER_MULTI_UPDATE_KEY_CONFLICT</literal>)
+    </para>
+
+    <para>
+      Message: Primary key/partition key update is not allowed since the
+      table is updated both as '%s' and '%s'.
+    </para>
+  </listitem>
+
+  <listitem>
     <para id="error_er_binlog_stmt_cache_size_greater_than_max">
-      Error: <literal>1725</literal> SQLSTATE: <literal>HY000</literal>
+      Error: <literal>1726</literal> SQLSTATE: <literal>HY000</literal>
       (<literal role="error">ER_BINLOG_STMT_CACHE_SIZE_GREATER_THAN_MAX</literal>)
     </para>
 

@@ -8287,5 +8299,61 @@
     </para>
   </listitem>
 
+  <listitem>
+    <para id="error_er_cant_update_table_in_create_table_select">
+      Error: <literal>1727</literal> SQLSTATE: <literal>HY000</literal>
+      (<literal role="error">ER_CANT_UPDATE_TABLE_IN_CREATE_TABLE_SELECT</literal>)
+    </para>
+
+    <para>
+      Message: Can't update table '%s' while '%s' is being created.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para id="error_er_partition_clause_on_nonpartitioned">
+      Error: <literal>1728</literal> SQLSTATE: <literal>HY000</literal>
+      (<literal role="error">ER_PARTITION_CLAUSE_ON_NONPARTITIONED</literal>)
+    </para>
+
+    <para>
+      Message: PARTITION () clause on non partitioned table
+    </para>
+  </listitem>
+
+  <listitem>
+    <para id="error_er_row_does_not_match_given_partition_set">
+      Error: <literal>1729</literal> SQLSTATE: <literal>HY000</literal>
+      (<literal role="error">ER_ROW_DOES_NOT_MATCH_GIVEN_PARTITION_SET</literal>)
+    </para>
+
+    <para>
+      Message: Found a row not matching the given partition set
+    </para>
+  </listitem>
+
+  <listitem>
+    <para id="error_er_no_such_partition">
+      Error: <literal>1730</literal> SQLSTATE: <literal>HY000</literal>
+      (<literal role="error">ER_NO_SUCH_PARTITION</literal>)
+    </para>
+
+    <para>
+      Message: partition '%s' doesn't exist
+    </para>
+  </listitem>
+
+  <listitem>
+    <para id="error_er_table_needs_rebuild">
+      Error: <literal>1731</literal> SQLSTATE: <literal>HY000</literal>
+      (<literal role="error">ER_TABLE_NEEDS_REBUILD</literal>)
+    </para>
+
+    <para>
+      Message: Table rebuild required. Please do "ALTER TABLE `%s`
+      FORCE" or dump/reload to fix it!
+    </para>
+  </listitem>
+
 </itemizedlist>
 <!-- END_OF_SERVER_ERROR_INFO -->


Thread
svn commit - mysqldoc@oter02: r25366 - in trunk: . dynamic-docs/changelog refman-5.5 refman-5.6paul.dubois12 Mar