diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-09 08:33:08 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-09 08:33:08 +0200 |
| commit | 06b7fce9f24116080168b924d17f71b979fc3a14 (patch) | |
| tree | 5ff9f5684bb118abbee5a9fd3b838d0841661287 /sql/protocol.cc | |
| parent | 1f2ff25eba6c089b2698cd0dab96155ccbf2afd2 (diff) | |
| parent | 8494039757a2f6353cc161e7824aab4fe2312d2a (diff) | |
| download | mariadb-git-06b7fce9f24116080168b924d17f71b979fc3a14.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 9ad9269f3b5..be73c94c9b2 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -426,7 +426,8 @@ bool net_send_error_packet(THD *thd, uint sql_errno, const char *err, uint error; char converted_err[MYSQL_ERRMSG_SIZE]; char buff[2+1+SQLSTATE_LENGTH+MYSQL_ERRMSG_SIZE], *pos; - + my_bool ret; + uint8 save_compress; DBUG_ENTER("send_error_packet"); if (net->vio == 0) @@ -454,8 +455,16 @@ bool net_send_error_packet(THD *thd, uint sql_errno, const char *err, /* Converted error message is always null-terminated. */ length= (uint) (strmake(pos, converted_err, MYSQL_ERRMSG_SIZE - 1) - buff); - DBUG_RETURN(net_write_command(net,(uchar) 255, (uchar*) "", 0, (uchar*) buff, - length)); + /* + Ensure that errors are not compressed. This is to ensure we can + detect out of bands error messages in the client + */ + if ((save_compress= net->compress)) + net->compress= 2; + ret= net_write_command(net,(uchar) 255, (uchar*) "", 0, (uchar*) buff, + length); + net->compress= save_compress; + DBUG_RETURN(ret); } #endif /* EMBEDDED_LIBRARY */ |