diff options
| author | unknown <bar@mysql.com> | 2005-07-12 13:18:25 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-07-12 13:18:25 +0500 |
| commit | 4c99c0e7db4ef394b9033eda45efc88e988bff10 (patch) | |
| tree | 7a45f0f80e08cef0c3110a5b3632e87d0e58b309 /vio | |
| parent | 2508b29e7c0833316934ed3bbecd74c5983bf388 (diff) | |
| parent | b18b97aace1ad49ce4fcb2ad634bc171ce289869 (diff) | |
| download | mariadb-git-4c99c0e7db4ef394b9033eda45efc88e988bff10.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
BitKeeper/etc/config:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
vio/viossl.c:
Auto merged
VC++Files/tests/mysql_client_test.dsp:
after merge change
sql/field_conv.cc:
after merge fix.
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 9a5eb1eb8df..7528e9071cf 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -316,7 +316,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); |