From f07d9957994c0c21f36511035215c83653097908 Mon Sep 17 00:00:00 2001 From: V S Murthy Sidagam Date: Mon, 20 Apr 2015 19:41:50 +0530 Subject: Bug #16861371 SSL_OP_NO_COMPRESSION NOT DEFINED post push change: missed the change in mysql-5.5 (Fixing compiler warning/error) --- vio/viossl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'vio') diff --git a/vio/viossl.c b/vio/viossl.c index 5960ab9ad4c..86bd94260e4 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -152,6 +152,10 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, SSL *ssl; my_bool unused; my_bool was_blocking; + /* Declared here to make compiler happy */ +#if !defined(HAVE_YASSL) && !defined(DBUG_OFF) + int j, n; +#endif DBUG_ENTER("ssl_do"); DBUG_PRINT("enter", ("ptr: 0x%lx, sd: %d ctx: 0x%lx", @@ -181,8 +185,8 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, { STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; ssl_comp_methods = SSL_COMP_get_compression_methods(); + n= sk_SSL_COMP_num(ssl_comp_methods); DBUG_PRINT("info", ("Available compression methods:\n")); - int j, n = sk_SSL_COMP_num(ssl_comp_methods); if (n == 0) fprintf(stderr, " NONE\n"); else -- cgit v1.2.1