diff options
| author | unknown <brian@zim.(none)> | 2005-07-06 15:55:49 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-07-06 15:55:49 -0700 |
| commit | b10b9fdc50b8e18cb893250496fd8386572971b5 (patch) | |
| tree | 70c928477b279f32987e91b37c9c18dffa53ff9f /vio | |
| parent | f8babb1a25f14fad368c032d843da99e4905fa89 (diff) | |
| parent | e2aa2abd725ea04c2809374e1125d3309b94b88e (diff) | |
| download | mariadb-git-b10b9fdc50b8e18cb893250496fd8386572971b5.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1
BitKeeper/etc/config:
Auto merged
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viossl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 043d23f0238..2f608209a53 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -315,7 +315,7 @@ int sslaccept(struct st_VioSSLAcceptorFd* ptr, Vio* vio, long timeout) vio_blocking(vio, net_blocking, &unused); DBUG_RETURN(1); } -#ifndef DBUF_OFF +#ifndef DBUG_OFF DBUG_PRINT("info",("SSL_get_cipher_name() = '%s'" ,SSL_get_cipher_name((SSL*) vio->ssl_arg))); client_cert = SSL_get_peer_certificate ((SSL*) vio->ssl_arg); |