diff options
| author | Andrei Elkin <andrei.elkin@oracle.com> | 2012-07-06 14:06:04 +0300 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@oracle.com> | 2012-07-06 14:06:04 +0300 |
| commit | 8080b0ef222082500b7e24ee743c358d7cfae074 (patch) | |
| tree | be92cadb87a1154f30b5b623228711499c6f4fea /sql | |
| parent | 298202f2fdf9a0dad88fb206d3012cf0608b8c98 (diff) | |
| parent | 42de9951fbaa53d60e9dd7b4c0bc1d3452403212 (diff) | |
| download | mariadb-git-8080b0ef222082500b7e24ee743c358d7cfae074.tar.gz | |
merge from 5.5 repo.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_acl.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index d3715fd2312..242967fff6a 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -8032,6 +8032,7 @@ static bool send_server_handshake_packet(MPVIO_EXT *mpvio, int2store(end + 3, mpvio->server_status[0]); int2store(end + 5, mpvio->client_capabilities >> 16); end[7]= data_len; + DBUG_EXECUTE_IF("poison_srv_handshake_scramble_len", end[7]= -100;); bzero(end + 8, 10); end+= 18; /* write scramble tail */ |