MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:jon Date:February 5 2007 3:19am
Subject:svn commit - mysqldoc@docsrva: r4781 - in branches/telcos: refman-5.1 tools
View as plain text  
Author: jstephens
Date: 2007-02-05 04:19:08 +0100 (Mon, 05 Feb 2007)
New Revision: 4781

Log:

Updated error messages for Telco Manual.

Testing some tweaks to make-errmsgs* scripts.



Removed:
   %ld  Skipped: %ld  Warnings: %ld</errortext>
   %ld Skipped: %ld Warnings: %ld
Modified:
   branches/telcos/refman-5.1/errmsgs-client.xml
   branches/telcos/refman-5.1/errmsgs-server.xml
   branches/telcos/tools/make-errmsgs-client.pl
   branches/telcos/tools/make-errmsgs-server.pl


Modified: branches/telcos/refman-5.1/errmsgs-client.xml
===================================================================
--- branches/telcos/refman-5.1/errmsgs-client.xml	2007-02-04 07:01:01 UTC (rev 4780)
+++ branches/telcos/refman-5.1/errmsgs-client.xml	2007-02-05 03:19:08 UTC (rev 4781)
Changed blocks: 1, Lines Added: 115, Lines Deleted: 180; 22550 bytes

@@ -4,634 +4,569 @@
 <!-- START_OF_CLIENT_ERROR_INFO -->
 <!-- DO NOT EDIT THIS FILE. It is generated automatically. -->
 <!-- To regenerate, use ./make-errmsgs-client.pl -->
-<itemizedlist>
 
+<itemizedlist>
   <listitem>
     <para>
-      Error: <literal>2000</literal>
-      (<literal>CR_UNKNOWN_ERROR</literal>)
+      Error: <errorcode>2000</errorcode> (<errorname>CR_UNKNOWN_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Unknown MySQL error
+      Message: <errortext>Unknown MySQL error</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2001</literal>
-      (<literal>CR_SOCKET_CREATE_ERROR</literal>)
+      Error: <errorcode>2001</errorcode> (<errorname>CR_SOCKET_CREATE_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't create UNIX socket (%d)
+      Message: <errortext>Can't create UNIX socket (%d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2002</literal>
-      (<literal>CR_CONNECTION_ERROR</literal>)
+      Error: <errorcode>2002</errorcode> (<errorname>CR_CONNECTION_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't connect to local MySQL server through socket '%s'
-      (%d)
+      Message: <errortext>Can't connect to local MySQL server through socket '%s' (%d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2003</literal>
-      (<literal>CR_CONN_HOST_ERROR</literal>)
+      Error: <errorcode>2003</errorcode> (<errorname>CR_CONN_HOST_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't connect to MySQL server on '%s' (%d)
+      Message: <errortext>Can't connect to MySQL server on '%s' (%d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2004</literal>
-      (<literal>CR_IPSOCK_ERROR</literal>)
+      Error: <errorcode>2004</errorcode> (<errorname>CR_IPSOCK_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't create TCP/IP socket (%d)
+      Message: <errortext>Can't create TCP/IP socket (%d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2005</literal>
-      (<literal>CR_UNKNOWN_HOST</literal>)
+      Error: <errorcode>2005</errorcode> (<errorname>CR_UNKNOWN_HOST</errorname>)
     </para>
 
     <para>
-      Message: Unknown MySQL server host '%s' (%d)
+      Message: <errortext>Unknown MySQL server host '%s' (%d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2006</literal>
-      (<literal>CR_SERVER_GONE_ERROR</literal>)
+      Error: <errorcode>2006</errorcode> (<errorname>CR_SERVER_GONE_ERROR</errorname>)
     </para>
 
     <para>
-      Message: MySQL server has gone away
+      Message: <errortext>MySQL server has gone away</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2007</literal>
-      (<literal>CR_VERSION_ERROR</literal>)
+      Error: <errorcode>2007</errorcode> (<errorname>CR_VERSION_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Protocol mismatch; server version = %d, client version =
-      %d
+      Message: <errortext>Protocol mismatch; server version = %d, client version = %d</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2008</literal>
-      (<literal>CR_OUT_OF_MEMORY</literal>)
+      Error: <errorcode>2008</errorcode> (<errorname>CR_OUT_OF_MEMORY</errorname>)
     </para>
 
     <para>
-      Message: MySQL client ran out of memory
+      Message: <errortext>MySQL client ran out of memory</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2009</literal>
-      (<literal>CR_WRONG_HOST_INFO</literal>)
+      Error: <errorcode>2009</errorcode> (<errorname>CR_WRONG_HOST_INFO</errorname>)
     </para>
 
     <para>
-      Message: Wrong host info
+      Message: <errortext>Wrong host info</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2010</literal>
-      (<literal>CR_LOCALHOST_CONNECTION</literal>)
+      Error: <errorcode>2010</errorcode> (<errorname>CR_LOCALHOST_CONNECTION</errorname>)
     </para>
 
     <para>
-      Message: Localhost via UNIX socket
+      Message: <errortext>Localhost via UNIX socket</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2011</literal>
-      (<literal>CR_TCP_CONNECTION</literal>)
+      Error: <errorcode>2011</errorcode> (<errorname>CR_TCP_CONNECTION</errorname>)
     </para>
 
     <para>
-      Message: %s via TCP/IP
+      Message: <errortext>%s via TCP/IP</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2012</literal>
-      (<literal>CR_SERVER_HANDSHAKE_ERR</literal>)
+      Error: <errorcode>2012</errorcode> (<errorname>CR_SERVER_HANDSHAKE_ERR</errorname>)
     </para>
 
     <para>
-      Message: Error in server handshake
+      Message: <errortext>Error in server handshake</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2013</literal> (<literal>CR_SERVER_LOST</literal>)
+      Error: <errorcode>2013</errorcode> (<errorname>CR_SERVER_LOST</errorname>)
     </para>
 
     <para>
-      Message: Lost connection to MySQL server during query
+      Message: <errortext>Lost connection to MySQL server during query</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2014</literal>
-      (<literal>CR_COMMANDS_OUT_OF_SYNC</literal>)
+      Error: <errorcode>2014</errorcode> (<errorname>CR_COMMANDS_OUT_OF_SYNC</errorname>)
     </para>
 
     <para>
-      Message: Commands out of sync; you can't run this command now
+      Message: <errortext>Commands out of sync; you can't run this command now</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2015</literal>
-      (<literal>CR_NAMEDPIPE_CONNECTION</literal>)
+      Error: <errorcode>2015</errorcode> (<errorname>CR_NAMEDPIPE_CONNECTION</errorname>)
     </para>
 
     <para>
-      Message: Named pipe: %s
+      Message: <errortext>Named pipe: %s</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2016</literal>
-      (<literal>CR_NAMEDPIPEWAIT_ERROR</literal>)
+      Error: <errorcode>2016</errorcode> (<errorname>CR_NAMEDPIPEWAIT_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't wait for named pipe to host: %s pipe: %s (%lu)
+      Message: <errortext>Can't wait for named pipe to host: %s  pipe: %s (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2017</literal>
-      (<literal>CR_NAMEDPIPEOPEN_ERROR</literal>)
+      Error: <errorcode>2017</errorcode> (<errorname>CR_NAMEDPIPEOPEN_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't open named pipe to host: %s pipe: %s (%lu)
+      Message: <errortext>Can't open named pipe to host: %s  pipe: %s (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2018</literal>
-      (<literal>CR_NAMEDPIPESETSTATE_ERROR</literal>)
+      Error: <errorcode>2018</errorcode> (<errorname>CR_NAMEDPIPESETSTATE_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't set state of named pipe to host: %s pipe: %s (%lu)
+      Message: <errortext>Can't set state of named pipe to host: %s  pipe: %s (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2019</literal>
-      (<literal>CR_CANT_READ_CHARSET</literal>)
+      Error: <errorcode>2019</errorcode> (<errorname>CR_CANT_READ_CHARSET</errorname>)
     </para>
 
     <para>
-      Message: Can't initialize character set %s (path: %s)
+      Message: <errortext>Can't initialize character set %s (path: %s)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2020</literal>
-      (<literal>CR_NET_PACKET_TOO_LARGE</literal>)
+      Error: <errorcode>2020</errorcode> (<errorname>CR_NET_PACKET_TOO_LARGE</errorname>)
     </para>
 
     <para>
-      Message: Got packet bigger than 'max_allowed_packet' bytes
+      Message: <errortext>Got packet bigger than 'max_allowed_packet' bytes</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2021</literal>
-      (<literal>CR_EMBEDDED_CONNECTION</literal>)
+      Error: <errorcode>2021</errorcode> (<errorname>CR_EMBEDDED_CONNECTION</errorname>)
     </para>
 
     <para>
-      Message: Embedded server
+      Message: <errortext>Embedded server</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2022</literal>
-      (<literal>CR_PROBE_SLAVE_STATUS</literal>)
+      Error: <errorcode>2022</errorcode> (<errorname>CR_PROBE_SLAVE_STATUS</errorname>)
     </para>
 
     <para>
-      Message: Error on SHOW SLAVE STATUS:
+      Message: <errortext>Error on SHOW SLAVE STATUS:</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2023</literal>
-      (<literal>CR_PROBE_SLAVE_HOSTS</literal>)
+      Error: <errorcode>2023</errorcode> (<errorname>CR_PROBE_SLAVE_HOSTS</errorname>)
     </para>
 
     <para>
-      Message: Error on SHOW SLAVE HOSTS:
+      Message: <errortext>Error on SHOW SLAVE HOSTS:</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2024</literal>
-      (<literal>CR_PROBE_SLAVE_CONNECT</literal>)
+      Error: <errorcode>2024</errorcode> (<errorname>CR_PROBE_SLAVE_CONNECT</errorname>)
     </para>
 
     <para>
-      Message: Error connecting to slave:
+      Message: <errortext>Error connecting to slave:</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2025</literal>
-      (<literal>CR_PROBE_MASTER_CONNECT</literal>)
+      Error: <errorcode>2025</errorcode> (<errorname>CR_PROBE_MASTER_CONNECT</errorname>)
     </para>
 
     <para>
-      Message: Error connecting to master:
+      Message: <errortext>Error connecting to master:</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2026</literal>
-      (<literal>CR_SSL_CONNECTION_ERROR</literal>)
+      Error: <errorcode>2026</errorcode> (<errorname>CR_SSL_CONNECTION_ERROR</errorname>)
     </para>
 
     <para>
-      Message: SSL connection error
+      Message: <errortext>SSL connection error</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2027</literal>
-      (<literal>CR_MALFORMED_PACKET</literal>)
+      Error: <errorcode>2027</errorcode> (<errorname>CR_MALFORMED_PACKET</errorname>)
     </para>
 
     <para>
-      Message: Malformed packet
+      Message: <errortext>Malformed packet</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2028</literal>
-      (<literal>CR_WRONG_LICENSE</literal>)
+      Error: <errorcode>2028</errorcode> (<errorname>CR_WRONG_LICENSE</errorname>)
     </para>
 
     <para>
-      Message: This client library is licensed only for use with MySQL
-      servers having '%s' license
+      Message: <errortext>This client library is licensed only for use with MySQL servers having '%s' license</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2029</literal>
-      (<literal>CR_NULL_POINTER</literal>)
+      Error: <errorcode>2029</errorcode> (<errorname>CR_NULL_POINTER</errorname>)
     </para>
 
     <para>
-      Message: Invalid use of null pointer
+      Message: <errortext>Invalid use of null pointer</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2030</literal>
-      (<literal>CR_NO_PREPARE_STMT</literal>)
+      Error: <errorcode>2030</errorcode> (<errorname>CR_NO_PREPARE_STMT</errorname>)
     </para>
 
     <para>
-      Message: Statement not prepared
+      Message: <errortext>Statement not prepared</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2031</literal>
-      (<literal>CR_PARAMS_NOT_BOUND</literal>)
+      Error: <errorcode>2031</errorcode> (<errorname>CR_PARAMS_NOT_BOUND</errorname>)
     </para>
 
     <para>
-      Message: No data supplied for parameters in prepared statement
+      Message: <errortext>No data supplied for parameters in prepared statement</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2032</literal>
-      (<literal>CR_DATA_TRUNCATED</literal>)
+      Error: <errorcode>2032</errorcode> (<errorname>CR_DATA_TRUNCATED</errorname>)
     </para>
 
     <para>
-      Message: Data truncated
+      Message: <errortext>Data truncated</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2033</literal>
-      (<literal>CR_NO_PARAMETERS_EXISTS</literal>)
+      Error: <errorcode>2033</errorcode> (<errorname>CR_NO_PARAMETERS_EXISTS</errorname>)
     </para>
 
     <para>
-      Message: No parameters exist in the statement
+      Message: <errortext>No parameters exist in the statement</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2034</literal>
-      (<literal>CR_INVALID_PARAMETER_NO</literal>)
+      Error: <errorcode>2034</errorcode> (<errorname>CR_INVALID_PARAMETER_NO</errorname>)
     </para>
 
     <para>
-      Message: Invalid parameter number
+      Message: <errortext>Invalid parameter number</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2035</literal>
-      (<literal>CR_INVALID_BUFFER_USE</literal>)
+      Error: <errorcode>2035</errorcode> (<errorname>CR_INVALID_BUFFER_USE</errorname>)
     </para>
 
     <para>
-      Message: Can't send long data for non-string/non-binary data types
-      (parameter: %d)
+      Message: <errortext>Can't send long data for non-string/non-binary data types (parameter: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2036</literal>
-      (<literal>CR_UNSUPPORTED_PARAM_TYPE</literal>)
+      Error: <errorcode>2036</errorcode> (<errorname>CR_UNSUPPORTED_PARAM_TYPE</errorname>)
     </para>
 
     <para>
-      Message: Using unsupported buffer type: %d (parameter: %d)
+      Message: <errortext>Using unsupported buffer type: %d  (parameter: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2037</literal>
-      (<literal>CR_SHARED_MEMORY_CONNECTION</literal>)
+      Error: <errorcode>2037</errorcode> (<errorname>CR_SHARED_MEMORY_CONNECTION</errorname>)
     </para>
 
     <para>
-      Message: Shared memory: %s
+      Message: <errortext>Shared memory: %s</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2038</literal>
-      (<literal>CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR</literal>)
+      Error: <errorcode>2038</errorcode> (<errorname>CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't open shared memory; client could not create request
-      event (%lu)
+      Message: <errortext>Can't open shared memory; client could not create request event (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2039</literal>
-      (<literal>CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR</literal>)
+      Error: <errorcode>2039</errorcode> (<errorname>CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't open shared memory; no answer event received from
-      server (%lu)
+      Message: <errortext>Can't open shared memory; no answer event received from server (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2040</literal>
-      (<literal>CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR</literal>)
+      Error: <errorcode>2040</errorcode> (<errorname>CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't open shared memory; server could not allocate file
-      mapping (%lu)
+      Message: <errortext>Can't open shared memory; server could not allocate file mapping (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2041</literal>
-      (<literal>CR_SHARED_MEMORY_CONNECT_MAP_ERROR</literal>)
+      Error: <errorcode>2041</errorcode> (<errorname>CR_SHARED_MEMORY_CONNECT_MAP_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't open shared memory; server could not get pointer to
-      file mapping (%lu)
+      Message: <errortext>Can't open shared memory; server could not get pointer to file mapping (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2042</literal>
-      (<literal>CR_SHARED_MEMORY_FILE_MAP_ERROR</literal>)
+      Error: <errorcode>2042</errorcode> (<errorname>CR_SHARED_MEMORY_FILE_MAP_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't open shared memory; client could not allocate file
-      mapping (%lu)
+      Message: <errortext>Can't open shared memory; client could not allocate file mapping (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2043</literal>
-      (<literal>CR_SHARED_MEMORY_MAP_ERROR</literal>)
+      Error: <errorcode>2043</errorcode> (<errorname>CR_SHARED_MEMORY_MAP_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't open shared memory; client could not get pointer to
-      file mapping (%lu)
+      Message: <errortext>Can't open shared memory; client could not get pointer to file mapping (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2044</literal>
-      (<literal>CR_SHARED_MEMORY_EVENT_ERROR</literal>)
+      Error: <errorcode>2044</errorcode> (<errorname>CR_SHARED_MEMORY_EVENT_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't open shared memory; client could not create %s
-      event (%lu)
+      Message: <errortext>Can't open shared memory; client could not create %s event (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2045</literal>
-      (<literal>CR_SHARED_MEMORY_CONNECT_ABANDONED_ERROR</literal>)
+      Error: <errorcode>2045</errorcode> (<errorname>CR_SHARED_MEMORY_CONNECT_ABANDONED_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't open shared memory; no answer from server (%lu)
+      Message: <errortext>Can't open shared memory; no answer from server (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2046</literal>
-      (<literal>CR_SHARED_MEMORY_CONNECT_SET_ERROR</literal>)
+      Error: <errorcode>2046</errorcode> (<errorname>CR_SHARED_MEMORY_CONNECT_SET_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't open shared memory; cannot send request event to
-      server (%lu)
+      Message: <errortext>Can't open shared memory; cannot send request event to server (%lu)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2047</literal>
-      (<literal>CR_CONN_UNKNOW_PROTOCOL</literal>)
+      Error: <errorcode>2047</errorcode> (<errorname>CR_CONN_UNKNOW_PROTOCOL</errorname>)
     </para>
 
     <para>
-      Message: Wrong or unknown protocol
+      Message: <errortext>Wrong or unknown protocol</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2048</literal>
-      (<literal>CR_INVALID_CONN_HANDLE</literal>)
+      Error: <errorcode>2048</errorcode> (<errorname>CR_INVALID_CONN_HANDLE</errorname>)
     </para>
 
     <para>
-      Message: Invalid connection handle
+      Message: <errortext>Invalid connection handle</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2049</literal> (<literal>CR_SECURE_AUTH</literal>)
+      Error: <errorcode>2049</errorcode> (<errorname>CR_SECURE_AUTH</errorname>)
     </para>
 
     <para>
-      Message: Connection using old (pre-4.1.1) authentication protocol
-      refused (client option 'secure_auth' enabled)
+      Message: <errortext>Connection using old (pre-4.1.1) authentication protocol refused (client option 'secure_auth' enabled)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2050</literal>
-      (<literal>CR_FETCH_CANCELED</literal>)
+      Error: <errorcode>2050</errorcode> (<errorname>CR_FETCH_CANCELED</errorname>)
     </para>
 
     <para>
-      Message: Row retrieval was canceled by mysql_stmt_close() call
+      Message: <errortext>Row retrieval was canceled by mysql_stmt_close() call</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2051</literal> (<literal>CR_NO_DATA</literal>)
+      Error: <errorcode>2051</errorcode> (<errorname>CR_NO_DATA</errorname>)
     </para>
 
     <para>
-      Message: Attempt to read column without prior row fetch
+      Message: <errortext>Attempt to read column without prior row fetch</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2052</literal>
-      (<literal>CR_NO_STMT_METADATA</literal>)
+      Error: <errorcode>2052</errorcode> (<errorname>CR_NO_STMT_METADATA</errorname>)
     </para>
 
     <para>
-      Message: Prepared statement contains no metadata
+      Message: <errortext>Prepared statement contains no metadata</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2053</literal>
-      (<literal>CR_NO_RESULT_SET</literal>)
+      Error: <errorcode>2053</errorcode> (<errorname>CR_NO_RESULT_SET</errorname>)
     </para>
 
     <para>
-      Message: Attempt to read a row while there is no result set
-      associated with the statement
+      Message: <errortext>Attempt to read a row while there is no result set associated with the statement</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2054</literal>
-      (<literal>CR_NOT_IMPLEMENTED</literal>)
+      Error: <errorcode>2054</errorcode> (<errorname>CR_NOT_IMPLEMENTED</errorname>)
     </para>
 
     <para>
-      Message: This feature is not implemented yet
+      Message: <errortext>This feature is not implemented yet</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>2055</literal>
-      (<literal>CR_SERVER_LOST_EXTENDED</literal>)
+      Error: <errorcode>2055</errorcode> (<errorname>CR_SERVER_LOST_EXTENDED</errorname>)
     </para>
 
     <para>
-      Message: Lost connection to MySQL server at '%s', system error: %d
+      Message: <errortext>Lost connection to MySQL server at '%s', system error: %d</errortext>
     </para>
   </listitem>
 
 </itemizedlist>
+
 <!-- END_OF_CLIENT_ERROR_INFO -->
+


Modified: branches/telcos/refman-5.1/errmsgs-server.xml
===================================================================
--- branches/telcos/refman-5.1/errmsgs-server.xml	2007-02-04 07:01:01 UTC (rev 4780)
+++ branches/telcos/refman-5.1/errmsgs-server.xml	2007-02-05 03:19:08 UTC (rev 4781)
Changed blocks: 1, Lines Added: 183, Lines Deleted: 272; 39542 bytes

@@ -4,6607 +4,5849 @@
 <!-- START_OF_SERVER_ERROR_INFO -->
 <!-- DO NOT EDIT THIS FILE. It is generated automatically. -->
 <!-- To regenerate, use ./make-errmsgs-server.pl -->
+
 <itemizedlist>
+  <listitem>
+    <para>
+      Error: <errorcode>1000</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_HASHCHK</errorname>)
+    </para>
 
+    <para>
+      Message: <errortext>hashchk</errortext>
+    </para>
+  </listitem>
+
   <listitem>
     <para>
-      Error: <literal>1000</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_HASHCHK</literal>)
+      Error: <errorcode>1001</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_NISAMCHK</errorname>)
     </para>
 
     <para>
-      Message: hashchk
+      Message: <errortext>isamchk</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1001</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_NISAMCHK</literal>)
+      Error: <errorcode>1002</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_NO</errorname>)
     </para>
 
     <para>
-      Message: isamchk
+      Message: <errortext>NO</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1002</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_NO</literal>)
+      Error: <errorcode>1003</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_YES</errorname>)
     </para>
 
     <para>
-      Message: NO
+      Message: <errortext>YES</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1003</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_YES</literal>)
+      Error: <errorcode>1004</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CANT_CREATE_FILE</errorname>)
     </para>
 
     <para>
-      Message: YES
+      Message: <errortext>Can't create file '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1004</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_CREATE_FILE</literal>)
+      Error: <errorcode>1005</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CANT_CREATE_TABLE</errorname>)
     </para>
 
     <para>
-      Message: Can't create file '%s' (errno: %d)
+      Message: <errortext>Can't create table '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1005</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_CREATE_TABLE</literal>)
+      Error: <errorcode>1006</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CANT_CREATE_DB</errorname>)
     </para>
 
     <para>
-      Message: Can't create table '%s' (errno: %d)
+      Message: <errortext>Can't create database '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1006</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_CREATE_DB</literal>)
+      Error: <errorcode>1007</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_DB_CREATE_EXISTS</errorname>)
     </para>
 
     <para>
-      Message: Can't create database '%s' (errno: %d)
+      Message: <errortext>Can't create database '%s'; database exists</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1007</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_DB_CREATE_EXISTS</literal>)
+      Error: <errorcode>1008</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_DB_DROP_EXISTS</errorname>)
     </para>
 
     <para>
-      Message: Can't create database '%s'; database exists
+      Message: <errortext>Can't drop database '%s'; database doesn't exist</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1008</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_DB_DROP_EXISTS</literal>)
+      Error: <errorcode>1009</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_DB_DROP_DELETE</errorname>)
     </para>
 
     <para>
-      Message: Can't drop database '%s'; database doesn't exist
+      Message: <errortext>Error dropping database (can't delete '%s', errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1009</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_DB_DROP_DELETE</literal>)
+      Error: <errorcode>1010</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_DB_DROP_RMDIR</errorname>)
     </para>
 
     <para>
-      Message: Error dropping database (can't delete '%s', errno: %d)
+      Message: <errortext>Error dropping database (can't rmdir '%s', errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1010</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_DB_DROP_RMDIR</literal>)
+      Error: <errorcode>1011</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CANT_DELETE_FILE</errorname>)
     </para>
 
     <para>
-      Message: Error dropping database (can't rmdir '%s', errno: %d)
+      Message: <errortext>Error on delete of '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1011</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_DELETE_FILE</literal>)
+      Error: <errorcode>1012</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CANT_FIND_SYSTEM_REC</errorname>)
     </para>
 
     <para>
-      Message: Error on delete of '%s' (errno: %d)
+      Message: <errortext>Can't read record in system table</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1012</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_FIND_SYSTEM_REC</literal>)
+      Error: <errorcode>1013</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CANT_GET_STAT</errorname>)
     </para>
 
     <para>
-      Message: Can't read record in system table
+      Message: <errortext>Can't get status of '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1013</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_GET_STAT</literal>)
+      Error: <errorcode>1014</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CANT_GET_WD</errorname>)
     </para>
 
     <para>
-      Message: Can't get status of '%s' (errno: %d)
+      Message: <errortext>Can't get working directory (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1014</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_GET_WD</literal>)
+      Error: <errorcode>1015</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CANT_LOCK</errorname>)
     </para>
 
     <para>
-      Message: Can't get working directory (errno: %d)
+      Message: <errortext>Can't lock file (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1015</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_LOCK</literal>)
+      Error: <errorcode>1016</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CANT_OPEN_FILE</errorname>)
     </para>
 
     <para>
-      Message: Can't lock file (errno: %d)
+      Message: <errortext>Can't open file: '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1016</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_OPEN_FILE</literal>)
+      Error: <errorcode>1017</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_FILE_NOT_FOUND</errorname>)
     </para>
 
     <para>
-      Message: Can't open file: '%s' (errno: %d)
+      Message: <errortext>Can't find file: '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1017</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_FILE_NOT_FOUND</literal>)
+      Error: <errorcode>1018</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CANT_READ_DIR</errorname>)
     </para>
 
     <para>
-      Message: Can't find file: '%s' (errno: %d)
+      Message: <errortext>Can't read dir of '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1018</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_READ_DIR</literal>)
+      Error: <errorcode>1019</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CANT_SET_WD</errorname>)
     </para>
 
     <para>
-      Message: Can't read dir of '%s' (errno: %d)
+      Message: <errortext>Can't change dir to '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1019</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CANT_SET_WD</literal>)
+      Error: <errorcode>1020</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_CHECKREAD</errorname>)
     </para>
 
     <para>
-      Message: Can't change dir to '%s' (errno: %d)
+      Message: <errortext>Record has changed since last read in table '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1020</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_CHECKREAD</literal>)
+      Error: <errorcode>1021</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_DISK_FULL</errorname>)
     </para>
 
     <para>
-      Message: Record has changed since last read in table '%s'
+      Message: <errortext>Disk full (%s); waiting for someone to free some space...</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1021</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_DISK_FULL</literal>)
+      Error: <errorcode>1022</errorcode> SQLSTATE: <errorcode>23000</errorcode> (<errorname>ER_DUP_KEY</errorname>)
     </para>
 
     <para>
-      Message: Disk full (%s); waiting for someone to free some space...
+      Message: <errortext>Can't write; duplicate key in table '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1022</literal> SQLSTATE: <literal>23000</literal>
-      (<literal>ER_DUP_KEY</literal>)
+      Error: <errorcode>1023</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_ERROR_ON_CLOSE</errorname>)
     </para>
 
     <para>
-      Message: Can't write; duplicate key in table '%s'
+      Message: <errortext>Error on close of '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1023</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_ERROR_ON_CLOSE</literal>)
+      Error: <errorcode>1024</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_ERROR_ON_READ</errorname>)
     </para>
 
     <para>
-      Message: Error on close of '%s' (errno: %d)
+      Message: <errortext>Error reading file '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1024</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_ERROR_ON_READ</literal>)
+      Error: <errorcode>1025</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_ERROR_ON_RENAME</errorname>)
     </para>
 
     <para>
-      Message: Error reading file '%s' (errno: %d)
+      Message: <errortext>Error on rename of '%s' to '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1025</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_ERROR_ON_RENAME</literal>)
+      Error: <errorcode>1026</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_ERROR_ON_WRITE</errorname>)
     </para>
 
     <para>
-      Message: Error on rename of '%s' to '%s' (errno: %d)
+      Message: <errortext>Error writing file '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1026</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_ERROR_ON_WRITE</literal>)
+      Error: <errorcode>1027</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_FILE_USED</errorname>)
     </para>
 
     <para>
-      Message: Error writing file '%s' (errno: %d)
+      Message: <errortext>'%s' is locked against change</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1027</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_FILE_USED</literal>)
+      Error: <errorcode>1028</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_FILSORT_ABORT</errorname>)
     </para>
 
     <para>
-      Message: '%s' is locked against change
+      Message: <errortext>Sort aborted</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1028</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_FILSORT_ABORT</literal>)
+      Error: <errorcode>1029</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_FORM_NOT_FOUND</errorname>)
     </para>
 
     <para>
-      Message: Sort aborted
+      Message: <errortext>View '%s' doesn't exist for '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1029</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_FORM_NOT_FOUND</literal>)
+      Error: <errorcode>1030</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_GET_ERRNO</errorname>)
     </para>
 
     <para>
-      Message: View '%s' doesn't exist for '%s'
+      Message: <errortext>Got error %d from storage engine</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1030</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_GET_ERRNO</literal>)
+      Error: <errorcode>1031</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_ILLEGAL_HA</errorname>)
     </para>
 
     <para>
-      Message: Got error %d from storage engine
+      Message: <errortext>Table storage engine for '%s' doesn't have this option</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1031</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_ILLEGAL_HA</literal>)
+      Error: <errorcode>1032</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_KEY_NOT_FOUND</errorname>)
     </para>
 
     <para>
-      Message: Table storage engine for '%s' doesn't have this option
+      Message: <errortext>Can't find record in '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1032</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_KEY_NOT_FOUND</literal>)
+      Error: <errorcode>1033</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_NOT_FORM_FILE</errorname>)
     </para>
 
     <para>
-      Message: Can't find record in '%s'
+      Message: <errortext>Incorrect information in file: '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1033</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_NOT_FORM_FILE</literal>)
+      Error: <errorcode>1034</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_NOT_KEYFILE</errorname>)
     </para>
 
     <para>
-      Message: Incorrect information in file: '%s'
+      Message: <errortext>Incorrect key file for table '%s'; try to repair it</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1034</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_NOT_KEYFILE</literal>)
+      Error: <errorcode>1035</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_OLD_KEYFILE</errorname>)
     </para>
 
     <para>
-      Message: Incorrect key file for table '%s'; try to repair it
+      Message: <errortext>Old key file for table '%s'; repair it!</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1035</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_OLD_KEYFILE</literal>)
+      Error: <errorcode>1036</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_OPEN_AS_READONLY</errorname>)
     </para>
 
     <para>
-      Message: Old key file for table '%s'; repair it!
+      Message: <errortext>Table '%s' is read only</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1036</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_OPEN_AS_READONLY</literal>)
+      Error: <errorcode>1037</errorcode> SQLSTATE: <errorcode>HY001</errorcode> (<errorname>ER_OUTOFMEMORY</errorname>)
     </para>
 
     <para>
-      Message: Table '%s' is read only
+      Message: <errortext>Out of memory; restart server and try again (needed %d bytes)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1037</literal> SQLSTATE: <literal>HY001</literal>
-      (<literal>ER_OUTOFMEMORY</literal>)
+      Error: <errorcode>1038</errorcode> SQLSTATE: <errorcode>HY001</errorcode> (<errorname>ER_OUT_OF_SORTMEMORY</errorname>)
     </para>
 
     <para>
-      Message: Out of memory; restart server and try again (needed %d
-      bytes)
+      Message: <errortext>Out of sort memory; increase server sort buffer size</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1038</literal> SQLSTATE: <literal>HY001</literal>
-      (<literal>ER_OUT_OF_SORTMEMORY</literal>)
+      Error: <errorcode>1039</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_UNEXPECTED_EOF</errorname>)
     </para>
 
     <para>
-      Message: Out of sort memory; increase server sort buffer size
+      Message: <errortext>Unexpected EOF found when reading file '%s' (errno: %d)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1039</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_UNEXPECTED_EOF</literal>)
+      Error: <errorcode>1040</errorcode> SQLSTATE: <errorcode>08004</errorcode> (<errorname>ER_CON_COUNT_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Unexpected EOF found when reading file '%s' (errno: %d)
+      Message: <errortext>Too many connections</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1040</literal> SQLSTATE: <literal>08004</literal>
-      (<literal>ER_CON_COUNT_ERROR</literal>)
+      Error: <errorcode>1041</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_OUT_OF_RESOURCES</errorname>)
     </para>
 
     <para>
-      Message: Too many connections
+      Message: <errortext>Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1041</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_OUT_OF_RESOURCES</literal>)
+      Error: <errorcode>1042</errorcode> SQLSTATE: <errorcode>08S01</errorcode> (<errorname>ER_BAD_HOST_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Out of memory; check if mysqld or some other process uses
-      all available memory; if not, you may have to use 'ulimit' to
-      allow mysqld to use more memory or you can add more swap space
+      Message: <errortext>Can't get hostname for your address</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1042</literal> SQLSTATE: <literal>08S01</literal>
-      (<literal>ER_BAD_HOST_ERROR</literal>)
+      Error: <errorcode>1043</errorcode> SQLSTATE: <errorcode>08S01</errorcode> (<errorname>ER_HANDSHAKE_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Can't get hostname for your address
+      Message: <errortext>Bad handshake</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1043</literal> SQLSTATE: <literal>08S01</literal>
-      (<literal>ER_HANDSHAKE_ERROR</literal>)
+      Error: <errorcode>1044</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_DBACCESS_DENIED_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Bad handshake
+      Message: <errortext>Access denied for user '%s'@'%s' to database '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1044</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_DBACCESS_DENIED_ERROR</literal>)
+      Error: <errorcode>1045</errorcode> SQLSTATE: <errorcode>28000</errorcode> (<errorname>ER_ACCESS_DENIED_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Access denied for user '%s'@'%s' to database '%s'
+      Message: <errortext>Access denied for user '%s'@'%s' (using password: %s)</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1045</literal> SQLSTATE: <literal>28000</literal>
-      (<literal>ER_ACCESS_DENIED_ERROR</literal>)
+      Error: <errorcode>1046</errorcode> SQLSTATE: <errorcode>3D000</errorcode> (<errorname>ER_NO_DB_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Access denied for user '%s'@'%s' (using password: %s)
+      Message: <errortext>No database selected</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1046</literal> SQLSTATE: <literal>3D000</literal>
-      (<literal>ER_NO_DB_ERROR</literal>)
+      Error: <errorcode>1047</errorcode> SQLSTATE: <errorcode>08S01</errorcode> (<errorname>ER_UNKNOWN_COM_ERROR</errorname>)
     </para>
 
     <para>
-      Message: No database selected
+      Message: <errortext>Unknown command</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1047</literal> SQLSTATE: <literal>08S01</literal>
-      (<literal>ER_UNKNOWN_COM_ERROR</literal>)
+      Error: <errorcode>1048</errorcode> SQLSTATE: <errorcode>23000</errorcode> (<errorname>ER_BAD_NULL_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Unknown command
+      Message: <errortext>Column '%s' cannot be null</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1048</literal> SQLSTATE: <literal>23000</literal>
-      (<literal>ER_BAD_NULL_ERROR</literal>)
+      Error: <errorcode>1049</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_BAD_DB_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Column '%s' cannot be null
+      Message: <errortext>Unknown database '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1049</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_BAD_DB_ERROR</literal>)
+      Error: <errorcode>1050</errorcode> SQLSTATE: <errorcode>42S01</errorcode> (<errorname>ER_TABLE_EXISTS_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Unknown database '%s'
+      Message: <errortext>Table '%s' already exists</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1050</literal> SQLSTATE: <literal>42S01</literal>
-      (<literal>ER_TABLE_EXISTS_ERROR</literal>)
+      Error: <errorcode>1051</errorcode> SQLSTATE: <errorcode>42S02</errorcode> (<errorname>ER_BAD_TABLE_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Table '%s' already exists
+      Message: <errortext>Unknown table '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1051</literal> SQLSTATE: <literal>42S02</literal>
-      (<literal>ER_BAD_TABLE_ERROR</literal>)
+      Error: <errorcode>1052</errorcode> SQLSTATE: <errorcode>23000</errorcode> (<errorname>ER_NON_UNIQ_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Unknown table '%s'
+      Message: <errortext>Column '%s' in %s is ambiguous</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1052</literal> SQLSTATE: <literal>23000</literal>
-      (<literal>ER_NON_UNIQ_ERROR</literal>)
+      Error: <errorcode>1053</errorcode> SQLSTATE: <errorcode>08S01</errorcode> (<errorname>ER_SERVER_SHUTDOWN</errorname>)
     </para>
 
     <para>
-      Message: Column '%s' in %s is ambiguous
+      Message: <errortext>Server shutdown in progress</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1053</literal> SQLSTATE: <literal>08S01</literal>
-      (<literal>ER_SERVER_SHUTDOWN</literal>)
+      Error: <errorcode>1054</errorcode> SQLSTATE: <errorcode>42S22</errorcode> (<errorname>ER_BAD_FIELD_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Server shutdown in progress
+      Message: <errortext>Unknown column '%s' in '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1054</literal> SQLSTATE: <literal>42S22</literal>
-      (<literal>ER_BAD_FIELD_ERROR</literal>)
+      Error: <errorcode>1055</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_WRONG_FIELD_WITH_GROUP</errorname>)
     </para>
 
     <para>
-      Message: Unknown column '%s' in '%s'
+      Message: <errortext>'%s' isn't in GROUP BY</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1055</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_WRONG_FIELD_WITH_GROUP</literal>)
+      Error: <errorcode>1056</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_WRONG_GROUP_FIELD</errorname>)
     </para>
 
     <para>
-      Message: '%s' isn't in GROUP BY
+      Message: <errortext>Can't group on '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1056</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_WRONG_GROUP_FIELD</literal>)
+      Error: <errorcode>1057</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_WRONG_SUM_SELECT</errorname>)
     </para>
 
     <para>
-      Message: Can't group on '%s'
+      Message: <errortext>Statement has sum functions and columns in same statement</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1057</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_WRONG_SUM_SELECT</literal>)
+      Error: <errorcode>1058</errorcode> SQLSTATE: <errorcode>21S01</errorcode> (<errorname>ER_WRONG_VALUE_COUNT</errorname>)
     </para>
 
     <para>
-      Message: Statement has sum functions and columns in same statement
+      Message: <errortext>Column count doesn't match value count</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1058</literal> SQLSTATE: <literal>21S01</literal>
-      (<literal>ER_WRONG_VALUE_COUNT</literal>)
+      Error: <errorcode>1059</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_TOO_LONG_IDENT</errorname>)
     </para>
 
     <para>
-      Message: Column count doesn't match value count
+      Message: <errortext>Identifier name '%s' is too long</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1059</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_TOO_LONG_IDENT</literal>)
+      Error: <errorcode>1060</errorcode> SQLSTATE: <errorcode>42S21</errorcode> (<errorname>ER_DUP_FIELDNAME</errorname>)
     </para>
 
     <para>
-      Message: Identifier name '%s' is too long
+      Message: <errortext>Duplicate column name '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1060</literal> SQLSTATE: <literal>42S21</literal>
-      (<literal>ER_DUP_FIELDNAME</literal>)
+      Error: <errorcode>1061</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_DUP_KEYNAME</errorname>)
     </para>
 
     <para>
-      Message: Duplicate column name '%s'
+      Message: <errortext>Duplicate key name '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1061</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_DUP_KEYNAME</literal>)
+      Error: <errorcode>1062</errorcode> SQLSTATE: <errorcode>23000</errorcode> (<errorname>ER_DUP_ENTRY</errorname>)
     </para>
 
     <para>
-      Message: Duplicate key name '%s'
+      Message: <errortext>Duplicate entry '%s' for key %d</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1062</literal> SQLSTATE: <literal>23000</literal>
-      (<literal>ER_DUP_ENTRY</literal>)
+      Error: <errorcode>1063</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_WRONG_FIELD_SPEC</errorname>)
     </para>
 
     <para>
-      Message: Duplicate entry '%s' for key '%s'
+      Message: <errortext>Incorrect column specifier for column '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1063</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_WRONG_FIELD_SPEC</literal>)
+      Error: <errorcode>1064</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_PARSE_ERROR</errorname>)
     </para>
 
     <para>
-      Message: Incorrect column specifier for column '%s'
+      Message: <errortext>%s near '%s' at line %d</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1064</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_PARSE_ERROR</literal>)
+      Error: <errorcode>1065</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_EMPTY_QUERY</errorname>)
     </para>
 
     <para>
-      Message: %s near '%s' at line %d
+      Message: <errortext>Query was empty</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1065</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_EMPTY_QUERY</literal>)
+      Error: <errorcode>1066</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_NONUNIQ_TABLE</errorname>)
     </para>
 
     <para>
-      Message: Query was empty
+      Message: <errortext>Not unique table/alias: '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1066</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_NONUNIQ_TABLE</literal>)
+      Error: <errorcode>1067</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_INVALID_DEFAULT</errorname>)
     </para>
 
     <para>
-      Message: Not unique table/alias: '%s'
+      Message: <errortext>Invalid default value for '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1067</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_INVALID_DEFAULT</literal>)
+      Error: <errorcode>1068</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_MULTIPLE_PRI_KEY</errorname>)
     </para>
 
     <para>
-      Message: Invalid default value for '%s'
+      Message: <errortext>Multiple primary key defined</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1068</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_MULTIPLE_PRI_KEY</literal>)
+      Error: <errorcode>1069</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_TOO_MANY_KEYS</errorname>)
     </para>
 
     <para>
-      Message: Multiple primary key defined
+      Message: <errortext>Too many keys specified; max %d keys allowed</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1069</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_TOO_MANY_KEYS</literal>)
+      Error: <errorcode>1070</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_TOO_MANY_KEY_PARTS</errorname>)
     </para>
 
     <para>
-      Message: Too many keys specified; max %d keys allowed
+      Message: <errortext>Too many key parts specified; max %d parts allowed</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1070</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_TOO_MANY_KEY_PARTS</literal>)
+      Error: <errorcode>1071</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_TOO_LONG_KEY</errorname>)
     </para>
 
     <para>
-      Message: Too many key parts specified; max %d parts allowed
+      Message: <errortext>Specified key was too long; max key length is %d bytes</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1071</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_TOO_LONG_KEY</literal>)
+      Error: <errorcode>1072</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_KEY_COLUMN_DOES_NOT_EXITS</errorname>)
     </para>
 
     <para>
-      Message: Specified key was too long; max key length is %d bytes
+      Message: <errortext>Key column '%s' doesn't exist in table</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1072</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_KEY_COLUMN_DOES_NOT_EXITS</literal>)
+      Error: <errorcode>1073</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_BLOB_USED_AS_KEY</errorname>)
     </para>
 
     <para>
-      Message: Key column '%s' doesn't exist in table
+      Message: <errortext>BLOB column '%s' can't be used in key specification with the used table type</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1073</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_BLOB_USED_AS_KEY</literal>)
+      Error: <errorcode>1074</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_TOO_BIG_FIELDLENGTH</errorname>)
     </para>
 
     <para>
-      Message: BLOB column '%s' can't be used in key specification with
-      the used table type
+      Message: <errortext>Column length too big for column '%s' (max = %d); use BLOB or TEXT instead</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1074</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_TOO_BIG_FIELDLENGTH</literal>)
+      Error: <errorcode>1075</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_WRONG_AUTO_KEY</errorname>)
     </para>
 
     <para>
-      Message: Column length too big for column '%s' (max = %d); use
-      BLOB or TEXT instead
+      Message: <errortext>Incorrect table definition; there can be only one auto column and it must be defined as a key</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1075</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_WRONG_AUTO_KEY</literal>)
+      Error: <errorcode>1076</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_READY</errorname>)
     </para>
 
     <para>
-      Message: Incorrect table definition; there can be only one auto
-      column and it must be defined as a key
+      Message: <errortext>%s: ready for connections. Version: '%s'  socket: '%s'  port: %d</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1076</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_READY</literal>)
+      Error: <errorcode>1077</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_NORMAL_SHUTDOWN</errorname>)
     </para>
 
     <para>
-      Message: %s: ready for connections. Version: '%s' socket: '%s'
-      port: %d
+      Message: <errortext>%s: Normal shutdown</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1077</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_NORMAL_SHUTDOWN</literal>)
+      Error: <errorcode>1078</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_GOT_SIGNAL</errorname>)
     </para>
 
     <para>
-      Message: %s: Normal shutdown
+      Message: <errortext>%s: Got signal %d. Aborting!</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1078</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_GOT_SIGNAL</literal>)
+      Error: <errorcode>1079</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_SHUTDOWN_COMPLETE</errorname>)
     </para>
 
     <para>
-      Message: %s: Got signal %d. Aborting!
+      Message: <errortext>%s: Shutdown complete</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1079</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_SHUTDOWN_COMPLETE</literal>)
+      Error: <errorcode>1080</errorcode> SQLSTATE: <errorcode>08S01</errorcode> (<errorname>ER_FORCING_CLOSE</errorname>)
     </para>
 
     <para>
-      Message: %s: Shutdown complete
+      Message: <errortext>%s: Forcing close of thread %ld  user: '%s'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1080</literal> SQLSTATE: <literal>08S01</literal>
-      (<literal>ER_FORCING_CLOSE</literal>)
+      Error: <errorcode>1081</errorcode> SQLSTATE: <errorcode>08S01</errorcode> (<errorname>ER_IPSOCK_ERROR</errorname>)
     </para>
 
     <para>
-      Message: %s: Forcing close of thread %ld user: '%s'
+      Message: <errortext>Can't create IP socket</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1081</literal> SQLSTATE: <literal>08S01</literal>
-      (<literal>ER_IPSOCK_ERROR</literal>)
+      Error: <errorcode>1082</errorcode> SQLSTATE: <errorcode>42S12</errorcode> (<errorname>ER_NO_SUCH_INDEX</errorname>)
     </para>
 
     <para>
-      Message: Can't create IP socket
+      Message: <errortext>Table '%s' has no index like the one used in CREATE INDEX; recreate the table</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1082</literal> SQLSTATE: <literal>42S12</literal>
-      (<literal>ER_NO_SUCH_INDEX</literal>)
+      Error: <errorcode>1083</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_WRONG_FIELD_TERMINATORS</errorname>)
     </para>
 
     <para>
-      Message: Table '%s' has no index like the one used in CREATE
-      INDEX; recreate the table
+      Message: <errortext>Field separator argument is not what is expected; check the manual</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1083</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_WRONG_FIELD_TERMINATORS</literal>)
+      Error: <errorcode>1084</errorcode> SQLSTATE: <errorcode>42000</errorcode> (<errorname>ER_BLOBS_AND_NO_TERMINATED</errorname>)
     </para>
 
     <para>
-      Message: Field separator argument is not what is expected; check
-      the manual
+      Message: <errortext>You can't use fixed rowlength with BLOBs; please use 'fields terminated by'</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1084</literal> SQLSTATE: <literal>42000</literal>
-      (<literal>ER_BLOBS_AND_NO_TERMINATED</literal>)
+      Error: <errorcode>1085</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_TEXTFILE_NOT_READABLE</errorname>)
     </para>
 
     <para>
-      Message: You can't use fixed rowlength with BLOBs; please use
-      'fields terminated by'
+      Message: <errortext>The file '%s' must be in the database directory or be readable by all</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1085</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_TEXTFILE_NOT_READABLE</literal>)
+      Error: <errorcode>1086</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_FILE_EXISTS_ERROR</errorname>)
     </para>
 
     <para>
-      Message: The file '%s' must be in the database directory or be
-      readable by all
+      Message: <errortext>File '%s' already exists</errortext>
     </para>
   </listitem>
 
   <listitem>
     <para>
-      Error: <literal>1086</literal> SQLSTATE: <literal>HY000</literal>
-      (<literal>ER_FILE_EXISTS_ERROR</literal>)
+      Error: <errorcode>1087</errorcode> SQLSTATE: <errorcode>HY000</errorcode> (<errorname>ER_LOAD_INFO</errorname>)
     </para>
 
     <para>
-      Message: File '%s' already exists


Modified: branches/telcos/tools/make-errmsgs-client.pl
===================================================================
--- branches/telcos/tools/make-errmsgs-client.pl	2007-02-04 07:01:01 UTC (rev 4780)
+++ branches/telcos/tools/make-errmsgs-client.pl	2007-02-05 03:19:08 UTC (rev 4781)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 5; 1346 bytes

@@ -24,6 +24,11 @@
 # - Add --language option.
 # - Use language value to produce language-specific translations for
 #   "Error" and "Message" in the output.
+# 2007-02-05 (JS):
+# - Use DocBook <errorcode>, <errorname>, <errortext> tags instead of
+#   <literal> for error codes, names, text.
+# - Make formatting of XML output match what's used elsewhere in the
+#   Manual.
 
 use strict;
 

@@ -212,11 +217,11 @@
 	for (my $i = 0; $i < @info; $i++)
 	{
 		my ($err_num, $err_sym, $msg) = @{$info[$i]};
-		print "<listitem><para>\n";
-		print "$term_error: <literal>$err_num</literal>\n";
-		print "(<literal>$err_sym</literal>)\n</para>\n";
-		print "\n<para>$term_message: $msg\n";
-		print "</para></listitem>\n";
+		print "  <listitem>\n    <para>\n";
+		print "      $term_error: <errorcode>$err_num</errorcode> ";
+		print "(<errorname>$err_sym</errorname>)\n    </para>\n";
+		print "\n    <para>\n      $term_message: <errortext>$msg</errortext>\n";
+		print "    </para>\n  </listitem>\n\n";
 	}
 	print "</itemizedlist>\n\n";
 	print "<!-- END_OF_CLIENT_ERROR_INFO -->\n\n";


Modified: branches/telcos/tools/make-errmsgs-server.pl
===================================================================
--- branches/telcos/tools/make-errmsgs-server.pl	2007-02-04 07:01:01 UTC (rev 4780)
+++ branches/telcos/tools/make-errmsgs-server.pl	2007-02-05 03:19:08 UTC (rev 4781)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 5; 1487 bytes

@@ -46,6 +46,11 @@
 # 2006-07-27
 # - Use language value to produce language-specific translations for
 #   "Error" and "Message" in the output.
+# 2007-02-05 (JS):
+# - Use DocBook <errorcode>, <errorname>, <errortext> tags instead of
+#   <literal> for error codes, names, text.
+# - Make formatting of XML output match what's used elsewhere in the
+#   Manual.
 
 use strict;
 

@@ -210,11 +215,11 @@
     my ($err_num, $err_sym, $sqlstate, $msg) = @{$quad_ref};
     # default state if missing
     $sqlstate = "HY000" if $sqlstate eq "";
-    print "<listitem><para>\n";
-    print "$term_error: <literal>$err_num</literal> SQLSTATE: <literal>$sqlstate</literal>\n";
-    print "(<literal>$err_sym</literal>)\n</para>\n";
-    print "\n<para>$term_message: $msg\n";
-    print "</para></listitem>\n";
+    print "  <listitem>\n    <para>\n";
+    print "      $term_error: <errorcode>$err_num</errorcode> SQLSTATE: <errorcode>$sqlstate</errorcode> ";
+    print "(<errorname>$err_sym</errorname>)\n    </para>\n";
+    print "\n    <para>\n      $term_message: <errortext>$msg</errortext>\n";
+    print "    </para>\n  </listitem>\n\n";
   }
   print "</itemizedlist>\n\n";
   print "<!-- END_OF_SERVER_ERROR_INFO -->\n\n";


Thread
svn commit - mysqldoc@docsrva: r4781 - in branches/telcos: refman-5.1 toolsjon5 Feb