summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-01-21 23:15:02 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-01-21 23:15:02 +0100
commit6918157e98b08e4465766990c4bb2edd6b86dbe8 (patch)
tree2e5d5cc261fb0e6400999d4d7ebdf5f68b4210c9 /sql/sql_acl.cc
parent1084fa77abad9a24caa1eddb5dfbda89c0bc0576 (diff)
parentade89fc8980a0b2763734815df7634a129c6d5dc (diff)
downloadmariadb-git-6918157e98b08e4465766990c4bb2edd6b86dbe8.tar.gz
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 224549f2add..b986c854391 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -12577,6 +12577,7 @@ static bool send_server_handshake_packet(MPVIO_EXT *mpvio,
int2store(end+5, thd->client_capabilities >> 16);
end[7]= data_len;
DBUG_EXECUTE_IF("poison_srv_handshake_scramble_len", end[7]= -100;);
+ DBUG_EXECUTE_IF("increase_srv_handshake_scramble_len", end[7]= 50;);
bzero(end + 8, 6);
int4store(end + 14, thd->client_capabilities >> 32);
end+= 18;