summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2011-08-24 09:18:50 +0200
committerTor Didriksen <tor.didriksen@oracle.com>2011-08-24 09:18:50 +0200
commit553587678e6bcd9ea3618ee6c8f27bff98fb6f41 (patch)
treeeb2ebfb5c81091953a2cf4762a80684d8977b158 /sql/sql_acl.cc
parentc8840c973c27dbb2ba74dd68e12bb7ee15acc4c2 (diff)
downloadmariadb-git-553587678e6bcd9ea3618ee6c8f27bff98fb6f41.tar.gz
Bug#10064164 post-push fix: build break unless #defined HAVE_OPENSSL
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index d3f03d40d22..aaf8ed26966 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -8615,6 +8615,7 @@ static ulong parse_client_handshake_packet(MPVIO_EXT *mpvio,
if (mpvio->charset_adapter->init_client_charset(charset_code))
return packet_error;
+skip_to_ssl:
#if defined(HAVE_OPENSSL)
DBUG_PRINT("info", ("client capabilities: %lu", mpvio->client_capabilities));
@@ -8623,7 +8624,6 @@ static ulong parse_client_handshake_packet(MPVIO_EXT *mpvio,
and wait for the client to send a new handshake packet.
The client isn't expected to send any more bytes until SSL is initialized.
*/
-skip_to_ssl:
if (mpvio->client_capabilities & CLIENT_SSL)
{
unsigned long errptr;