diff options
| author | unknown <serg@sergbook.mysql.com> | 2006-04-25 17:12:06 -0700 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2006-04-25 17:12:06 -0700 |
| commit | a940b1a7445e7b8e9db9d22bf919e30cbac4fe54 (patch) | |
| tree | 221127d86f9b6db580489d9f67b5b59f8d09c9d3 /sql | |
| parent | e262aaa8853d291455b0c7c50b52b6346a9b3525 (diff) | |
| download | mariadb-git-a940b1a7445e7b8e9db9d22bf919e30cbac4fe54.tar.gz | |
after merge fix
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 3fc71351d74..51ef3f31b26 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -908,7 +908,7 @@ static int check_connection(THD *thd) db + passwd_len + 1 : 0; uint db_len= db ? strlen(db) : 0; - if (passwd + passwd_len + db_len > net->read_pos + pkt_len) + if (passwd + passwd_len + db_len > (char *)net->read_pos + pkt_len) { inc_host_errors(&thd->remote.sin_addr); return ER_HANDSHAKE_ERROR; @@ -1388,13 +1388,13 @@ bool dispatch_command(enum enum_server_command command, THD *thd, uint db_len= *(uchar*) packet; if (db_len >= packet_length || db_len > NAME_LEN) { - send_error(&thd->net, ER_UNKNOWN_COM_ERROR); + send_error(thd, ER_UNKNOWN_COM_ERROR); break; } uint tbl_len= *(uchar*) (packet + db_len + 1); if (db_len+tbl_len+2 > packet_length || tbl_len > NAME_LEN) { - send_error(&thd->net, ER_UNKNOWN_COM_ERROR); + send_error(thd, ER_UNKNOWN_COM_ERROR); break; } |