diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-10-17 12:00:36 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-10-17 12:00:36 -0400 |
| commit | 91c4edfbfb46ae8a1ee2d003a47c3f6e7d553cc7 (patch) | |
| tree | 84fbe63277a4e608f6bdc2f6846c553a69a4043d /vio | |
| parent | 184467a2cc77d775ef4412a93f9e0d0271baf510 (diff) | |
| parent | 3a709f50b27acf9bce0fd6e5ddcd45ae2f277bee (diff) | |
| download | mariadb-git-91c4edfbfb46ae8a1ee2d003a47c3f6e7d553cc7.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viossl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 180c7a50fa7..9cc4523d32e 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -82,7 +82,7 @@ int vio_ssl_read(Vio *vio, gptr buf, int size) { int r; DBUG_ENTER("vio_ssl_read"); - DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d, ssl_: 0x%p", + DBUG_PRINT("enter", ("sd: %d, buf: 0x%lx, size: %d, ssl_: 0x%lx", vio->sd, buf, size, vio->ssl_arg)); r= SSL_read((SSL*) vio->ssl_arg, buf, size); @@ -99,7 +99,7 @@ int vio_ssl_write(Vio *vio, const gptr buf, int size) { int r; DBUG_ENTER("vio_ssl_write"); - DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size)); + DBUG_PRINT("enter", ("sd: %d, buf: 0x%lx, size: %d", vio->sd, buf, size)); r= SSL_write((SSL*) vio->ssl_arg, buf, size); #ifndef DBUG_OFF |