diff options
| author | V S Murthy Sidagam <venkata.sidagam@oracle.com> | 2015-04-20 19:41:50 +0530 |
|---|---|---|
| committer | V S Murthy Sidagam <venkata.sidagam@oracle.com> | 2015-04-20 19:41:50 +0530 |
| commit | f07d9957994c0c21f36511035215c83653097908 (patch) | |
| tree | ffea2fa61fd35996b45052e97ed0e3e7c0ed041d /vio | |
| parent | e7ad7f050e2d0887f2587e5801356ac411a67ed3 (diff) | |
| download | mariadb-git-f07d9957994c0c21f36511035215c83653097908.tar.gz | |
Bug #16861371 SSL_OP_NO_COMPRESSION NOT DEFINED
post push change: missed the change in mysql-5.5
(Fixing compiler warning/error)
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viossl.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 |