1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new client error added: CR_MALFORMED_PACKET

Browse Source
This commit is contained in:
serg@serg.mysql.com 2002-12-04 17:37:51 +01:00
parent b4302479a3
commit 44db958ba2
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/errmsg.h
View File

@ -62,3 +62,5 @@ extern const char *client_errors[]; /* Error messages */
#define CR_PROBE_SLAVE_CONNECT 2024 #define CR_PROBE_SLAVE_CONNECT 2024
#define CR_PROBE_MASTER_CONNECT 2025 #define CR_PROBE_MASTER_CONNECT 2025
#define CR_SSL_CONNECTION_ERROR 2026 #define CR_SSL_CONNECTION_ERROR 2026
#define CR_MALFORMED_PACKET 2027

9
libmysql/errmsg.c
View File

@ -50,7 +50,8 @@ const char *client_errors[]=
"Error on SHOW SLAVE HOSTS:", "Error on SHOW SLAVE HOSTS:",
"Error connecting to slave:", "Error connecting to slave:",
"Error connecting to master:", "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 */ /* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */
@ -84,7 +85,8 @@ const char *client_errors[]=
"Error on SHOW SLAVE HOSTS:", "Error on SHOW SLAVE HOSTS:",
"Error connecting to slave:", "Error connecting to slave:",
"Error connecting to master:", "Error connecting to master:",
"SSL connection error" "SSL connection error",
"Malformed packet"
}; };
#else /* ENGLISH */ #else /* ENGLISH */
@ -116,7 +118,8 @@ const char *client_errors[]=
"Error on SHOW SLAVE HOSTS:", "Error on SHOW SLAVE HOSTS:",
"Error connecting to slave:", "Error connecting to slave:",
"Error connecting to master:", "Error connecting to master:",
"SSL connection error" "SSL connection error",
"Malformed packet"
}; };
#endif #endif

2
libmysql/libmysql.c
View File

@ -985,7 +985,7 @@ static MYSQL_DATA *read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
if (to+len > end_to) if (to+len > end_to)
{ {
free_rows(result); free_rows(result);
net->last_errno=CR_UNKNOWN_ERROR; net->last_errno=CR_MALFORMED_PACKET;
strmov(net->last_error,ER(net->last_errno)); strmov(net->last_error,ER(net->last_errno));
DBUG_RETURN(0); DBUG_RETURN(0);
} }