Reword some client error messages.

1 files changed, 56 insertions, 56 deletions

diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index ad93c1b8f9e..3e1872f7e93 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* Error messages for MySQL clients */
-/* error messages for the daemon is in share/language/errmsg.sys */
+/* (Error messages for the daemon are in share/language/errmsg.sys) */
 
 #include <my_global.h>
 #include <my_sys.h>
@@ -29,22 +29,22 @@ const char *client_errors[]=
   "Keine Verbindung zu lokalem MySQL Server, socket: '%-.100s' (%d)",
   "Keine Verbindung zu MySQL Server auf %-.100s (%d)",
   "Kann TCP/IP-Socket nicht anlegen (%d)",
-  "Unbekannter MySQL Server Host (%-.100s) (%d)",
+  "Unbekannter MySQL server host (%-.100s) (%d)",
   "MySQL Server nicht vorhanden",
-  "Protokolle ungleich. Server Version = % d Client Version = %d",
-  "MySQL client got out of memory",
+  "Protokolle ungleich; Server version = %d, client version = %d",
+  "MySQL client ran out of memory",
   "Wrong host info",
   "Localhost via UNIX socket",
   "%-.100s via TCP/IP",
   "Error in server handshake",
   "Lost connection to MySQL server during query",
-  "Commands out of sync; You can't run this command now",
+  "Commands out of sync; you can't run this command now",
   "Verbindung ueber Named Pipe; Host: %-.100s",
   "Kann nicht auf Named Pipe warten. Host: %-.64s  pipe: %-.32s (%lu)",
   "Kann Named Pipe nicht oeffnen. Host: %-.64s  pipe: %-.32s (%lu)",
   "Kann den Status der Named Pipe nicht setzen.  Host: %-.64s  pipe: %-.32s (%lu)",
   "Can't initialize character set %-.32s (path: %-.100s)",
-  "Got packet bigger than 'max_allowed_packet'",
+  "Got packet bigger than 'max_allowed_packet' bytes",
   "Embedded server",
   "Error on SHOW SLAVE STATUS:",
   "Error on SHOW SLAVE HOSTS:",
@@ -55,26 +55,26 @@ const char *client_errors[]=
   "This client library is licensed only for use with MySQL servers having '%s' license",
   "Invalid use of null pointer",
   "Statement not prepared",
-  "Parameters data was not supplied",
+  "No data supplied for parameters in prepared statement",
   "Data truncated",
-  "No parameters exists in the statement",
+  "No parameters exist in the statement",
   "Invalid parameter number",
-  "Can't send long data for non string or binary data types (parameter: %d)",
+  "Can't send long data for non-string/non-binary data types (parameter: %d)",
   "Using unsupported buffer type: %d  (parameter: %d)",
   "Shared memory (%lu)",
-  "Can't open shared memory. Request event don't create  (%lu)",
-  "Can't open shared memory. Answer event don't create  (%lu)",
-  "Can't open shared memory. File mapping don't create  (%lu)",
-  "Can't open shared memory. Map of memory don't create  (%lu)",
-  "Can't open shared memory. File mapping don't create for client (%lu)",
-  "Can't open shared memory. Map of memory don't create for client (%lu)",
-  "Can't open shared memory. %s event don't create for client (%lu)",
-  "Can't open shared memory. Server abandoded and don't sent the answer event (%lu)",
-  "Can't open shared memory. Can't send the request event to server (%lu)",
+  "Can't open shared memory; client could not create request event (%lu)",
+  "Can't open shared memory; no answer event received from server (%lu)",
+  "Can't open shared memory; server could not allocate file mapping (%lu)",
+  "Can't open shared memory; server could not get pointer to file mapping (%lu)",
+  "Can't open shared memory; client could not allocate file mapping (%lu)",
+  "Can't open shared memory; client could not get pointer to file mapping (%lu)",
+  "Can't open shared memory; client could not create %s event (%lu)",
+  "Can't open shared memory; no answer from server (%lu)",
+  "Can't open shared memory; cannot send request event to server (%lu)",
   "Wrong or unknown protocol",
   "Invalid connection handle",
-  "Connection using old (pre 4.1.1) authentication protocol refused (client option 'secure_auth' enabled)",
-  "Row retrieval was cancelled by mysql_stmt_close() call",
+  "Connection using old (pre-4.1.1) authentication protocol refused (client option 'secure_auth' enabled)",
+  "Row retrieval was canceled by mysql_stmt_close() call",
   "Attempt to read column without prior row fetch"
 };
 
@@ -90,20 +90,20 @@ const char *client_errors[]=
   "Não pode criar 'socket TCP/IP' (%d)",
   "'Host' servidor MySQL '%-.100s' (%d) desconhecido",
   "Servidor MySQL desapareceu",
-  "Incompatibilidade de protocolos. Versão do Servidor: %d - Versão do Cliente: %d",
+  "Incompatibilidade de protocolos; versão do servidor = %d, versão do cliente = %d",
   "Cliente do MySQL com falta de memória",
   "Informação inválida de 'host'",
   "Localhost via 'UNIX socket'",
   "%-.100s via 'TCP/IP'",
   "Erro na negociação de acesso ao servidor",
   "Conexão perdida com servidor MySQL durante 'query'",
-  "Comandos fora de sincronismo. Você não pode executar este comando agora",
+  "Comandos fora de sincronismo; você não pode executar este comando agora",
   "%-.100s via 'named pipe'",
   "Não pode esperar pelo 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)",
   "Não pode abrir 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)",
   "Não pode estabelecer o estado do 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)",
   "Não pode inicializar conjunto de caracteres %-.32s (caminho %-.100s)",
-  "Obteve pacote maior do que 'max_allowed_packet'",
+  "Obteve pacote maior do que 'max_allowed_packet' bytes",
   "Embedded server"
   "Error on SHOW SLAVE STATUS:",
   "Error on SHOW SLAVE HOSTS:",
@@ -114,26 +114,26 @@ const char *client_errors[]=
   "This client library is licensed only for use with MySQL servers having '%s' license",
   "Invalid use of null pointer",
   "Statement not prepared",
-  "Parameters data was not supplied",
+  "No data supplied for parameters in prepared statement",
   "Data truncated",
-  "No parameters exists in the statement",
+  "No parameters exist in the statement",
   "Invalid parameter number",
-  "Can't send long data for non string or binary data types (parameter: %d)",
+  "Can't send long data for non-string/non-binary data types (parameter: %d)",
   "Using unsupported buffer type: %d  (parameter: %d)",
   "Shared memory (%lu)",
-  "Can't open shared memory. Request event don't create  (%lu)",
-  "Can't open shared memory. Answer event don't create  (%lu)",
-  "Can't open shared memory. File mapping don't create  (%lu)",
-  "Can't open shared memory. Map of memory don't create  (%lu)",
-  "Can't open shared memory. File mapping don't create for client (%lu)",
-  "Can't open shared memory. Map of memory don't create for client (%lu)",
-  "Can't open shared memory. %s event don't create for client (%lu)",
-  "Can't open shared memory. Server abandoded and don't sent the answer event (%lu)",
-  "Can't open shared memory. Can't send the request event to server (%lu)",
+  "Can't open shared memory; client could not create request event (%lu)",
+  "Can't open shared memory; no answer event received from server (%lu)",
+  "Can't open shared memory; server could not allocate file mapping (%lu)",
+  "Can't open shared memory; server could not get pointer to file mapping (%lu)",
+  "Can't open shared memory; client could not allocate file mapping (%lu)",
+  "Can't open shared memory; client could not get pointer to file mapping (%lu)",
+  "Can't open shared memory; client could not create %s event (%lu)",
+  "Can't open shared memory; no answer from server (%lu)",
+  "Can't open shared memory; cannot send request event to server (%lu)",
   "Wrong or unknown protocol",
   "Invalid connection handle",
-  "Connection using old (pre 4.1.1) authentication protocol refused (client option 'secure_auth' enabled)",
-  "Row retrieval was cancelled by mysql_stmt_close() call",
+  "Connection using old (pre-4.1.1) authentication protocol refused (client option 'secure_auth' enabled)",
+  "Row retrieval was canceled by mysql_stmt_close() call",
   "Attempt to read column without prior row fetch"
 };
 
@@ -145,22 +145,22 @@ const char *client_errors[]=
   "Can't connect to local MySQL server through socket '%-.100s' (%d)",
   "Can't connect to MySQL server on '%-.100s' (%d)",
   "Can't create TCP/IP socket (%d)",
-  "Unknown MySQL Server Host '%-.100s' (%d)",
+  "Unknown MySQL server host '%-.100s' (%d)",
   "MySQL server has gone away",
-  "Protocol mismatch. Server Version = %d Client Version = %d",
-  "MySQL client run out of memory",
+  "Protocol mismatch; server version = %d, client version = %d",
+  "MySQL client ran out of memory",
   "Wrong host info",
   "Localhost via UNIX socket",
   "%-.100s via TCP/IP",
   "Error in server handshake",
   "Lost connection to MySQL server during query",
-  "Commands out of sync;  You can't run this command now",
+  "Commands out of sync; you can't run this command now",
   "%-.100s via named pipe",
   "Can't wait for named pipe to host: %-.64s  pipe: %-.32s (%lu)",
   "Can't open named pipe to host: %-.64s  pipe: %-.32s (%lu)",
   "Can't set state of named pipe to host: %-.64s  pipe: %-.32s (%lu)",
   "Can't initialize character set %-.32s (path: %-.100s)",
-  "Got packet bigger than 'max_allowed_packet'",
+  "Got packet bigger than 'max_allowed_packet' bytes",
   "Embedded server",
   "Error on SHOW SLAVE STATUS:",
   "Error on SHOW SLAVE HOSTS:",
@@ -171,26 +171,26 @@ const char *client_errors[]=
   "This client library is licensed only for use with MySQL servers having '%s' license",
   "Invalid use of null pointer",
   "Statement not prepared",
-  "Not all parameters data supplied",
+  "No data supplied for parameters in prepared statement",
   "Data truncated",
-  "No parameters exists in the statement",
+  "No parameters exist in the statement",
   "Invalid parameter number",
-  "Can't send long data for non string or binary data types (parameter: %d)",
+  "Can't send long data for non-string/non-binary data types (parameter: %d)",
   "Using unsupported buffer type: %d  (parameter: %d)",
   "Shared memory (%lu)",
-  "Can't open shared memory. Request event don't create  (%lu)",
-  "Can't open shared memory. Answer event don't create  (%lu)",
-  "Can't open shared memory. File mapping don't create  (%lu)",
-  "Can't open shared memory. Map of memory don't create  (%lu)",
-  "Can't open shared memory. File mapping don't create for client (%lu)",
-  "Can't open shared memory. Map of memory don't create for client (%lu)",
-  "Can't open shared memory. %s event don't create for client (%lu)",
-  "Can't open shared memory. Server abandoded and don't sent the answer event (%lu)",
-  "Can't open shared memory. Can't send the request event to server (%lu)",
+  "Can't open shared memory; client could not create request event (%lu)",
+  "Can't open shared memory; no answer event received from server (%lu)",
+  "Can't open shared memory; server could not allocate file mapping (%lu)",
+  "Can't open shared memory; server could not get pointer to file mapping (%lu)",
+  "Can't open shared memory; client could not allocate file mapping (%lu)",
+  "Can't open shared memory; client could not get pointer to file mapping (%lu)",
+  "Can't open shared memory; client could not create %s event (%lu)",
+  "Can't open shared memory; no answer from server (%lu)",
+  "Can't open shared memory; cannot send request event to server (%lu)",
   "Wrong or unknown protocol",
   "Invalid connection handle",
-  "Connection using old (pre 4.1.1) authentication protocol refused (client option 'secure_auth' enabled)",
-  "Row retrieval was cancelled by mysql_stmt_close() call",
+  "Connection using old (pre-4.1.1) authentication protocol refused (client option 'secure_auth' enabled)",
+  "Row retrieval was canceled by mysql_stmt_close() call",
   "Attempt to read column without prior row fetch"
 };
 #endif