diff options
| author | serg@serg.mysql.com <> | 2002-12-04 17:37:51 +0100 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2002-12-04 17:37:51 +0100 |
| commit | 44db958ba272fb9e7e3e2c7911f2beb5b67bbcbb (patch) | |
| tree | d1e99894d234a00c745d880605d3097b38bea5c0 /libmysql | |
| parent | b4302479a3b634ce3d6c5d2eac709c1253db7ea9 (diff) | |
| download | mariadb-git-44db958ba272fb9e7e3e2c7911f2beb5b67bbcbb.tar.gz | |
new client error added: CR_MALFORMED_PACKET
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/errmsg.c | 11 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 47d19281a04..375ca7329c0 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -50,7 +50,8 @@ const char *client_errors[]= "Error on SHOW SLAVE HOSTS:", "Error connecting to slave:", "Error connecting to master:", - "SSL connection error" + "SSL connection error", + "Malformed packet" }; /* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */ @@ -63,7 +64,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", @@ -84,7 +85,8 @@ const char *client_errors[]= "Error on SHOW SLAVE HOSTS:", "Error connecting to slave:", "Error connecting to master:", - "SSL connection error" + "SSL connection error", + "Malformed packet" }; #else /* ENGLISH */ @@ -116,7 +118,8 @@ const char *client_errors[]= "Error on SHOW SLAVE HOSTS:", "Error connecting to slave:", "Error connecting to master:", - "SSL connection error" + "SSL connection error", + "Malformed packet" }; #endif diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index da6c445d161..6965c1d79d8 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -985,7 +985,7 @@ static MYSQL_DATA *read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, if (to+len > end_to) { free_rows(result); - net->last_errno=CR_UNKNOWN_ERROR; + net->last_errno=CR_MALFORMED_PACKET; strmov(net->last_error,ER(net->last_errno)); DBUG_RETURN(0); } |