diff options
| author | monty@mashka.mysql.fi <> | 2002-12-05 19:38:42 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-05 19:38:42 +0200 |
| commit | 859b68847666823baa328c5c7f3da96787807bb3 (patch) | |
| tree | 56f9dc35fe3c9e6c4f341e577ff3db68855d9e81 /libmysql/errmsg.c | |
| parent | 564487d7c00098e8a37c8e675197414667685452 (diff) | |
| parent | 496a0e1630f9dc4047fb5244cb87ee5ca03b409e (diff) | |
| download | mariadb-git-859b68847666823baa328c5c7f3da96787807bb3.tar.gz | |
Merge with 4.0.6
Diffstat (limited to 'libmysql/errmsg.c')
| -rw-r--r-- | libmysql/errmsg.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index bfd253728ce..2eecb5c2afd 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -51,7 +51,7 @@ const char *client_errors[]= "Error connecting to slave:", "Error connecting to master:", "SSL connection error", - "Invalid connection handle", + "Malformed packet", "Invalid use of null pointer", "Statement not prepared", "Not all parameters data supplied", @@ -70,7 +70,8 @@ const char *client_errors[]= "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)", - "Wrong or unknown protocol" + "Wrong or unknown protocol", + "Invalid connection handle" }; /* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */ @@ -83,7 +84,7 @@ const char *client_errors[]= "Não pode se conectar ao servidor MySQL local através do 'socket' '%-.64s' (%d)", "Não pode se conectar ao servidor MySQL em '%-.64s' (%d)", "Não pode criar 'socket TCP/IP' (%d)", - "'Host' servidor MySQL '%-.64s' (%d) desconhecido", + "'Host' servidor MySQL '%-.64s' (%d) desconhecido", "Servidor MySQL desapareceu", "Incompatibilidade de protocolos. Versão do Servidor: %d - Versão do Cliente: %d", "Cliente do MySQL com falta de memória", @@ -105,7 +106,7 @@ const char *client_errors[]= "Error connecting to slave:", "Error connecting to master:", "SSL connection error", - "Invalid connection handle", + "Malformed packet", "Invalid use of null pointer", "Statement not prepared", "Not all parameters data supplied", @@ -124,7 +125,8 @@ const char *client_errors[]= "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)", - "Wrong or unknown protocol" + "Wrong or unknown protocol", + "Invalid connection handle" }; #else /* ENGLISH */ @@ -157,7 +159,7 @@ const char *client_errors[]= "Error connecting to slave:", "Error connecting to master:", "SSL connection error", - "Invalid connection handle", + "Malformed packet", "Invalid use of null pointer", "Statement not prepared", "Not all parameters data supplied", @@ -176,7 +178,8 @@ const char *client_errors[]= "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)", - "Wrong or unknown protocol" + "Wrong or unknown protocol", + "Invalid connection handle" }; #endif |