diff options
| author | unknown <konstantin@mysql.com> | 2005-11-25 13:57:13 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-11-25 13:57:13 +0300 |
| commit | 61e454c0a9758a2c12fc8b949706d6f356a02041 (patch) | |
| tree | cee4e8f13e8c0b9e324e58db5a2e995b60fe5ea0 /vio | |
| parent | 1be7a7afa58d241895e73a45292c4a111c98a74c (diff) | |
| parent | 2a1ae3a5e3cbc7bb076c91ba0f8b5e6242319b28 (diff) | |
| download | mariadb-git-61e454c0a9758a2c12fc8b949706d6f356a02041.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/table.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viossl.c:
Auto merged
include/my_base.h:
Manual merge.
mysql-test/r/ps.result:
Manual merge.
mysql-test/r/select.result:
Manual merge.
mysql-test/t/ndb_alter_table.test:
Manual merge.
mysql-test/t/ndb_basic.test:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql-common/client.c:
k
sql/ha_ndbcluster.cc:
Manual merge.
sql/item.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/vio.c | 2 | ||||
| -rw-r--r-- | vio/vio_priv.h | 1 | ||||
| -rw-r--r-- | vio/viossl.c | 19 |
3 files changed, 1 insertions, 21 deletions
diff --git a/vio/vio.c b/vio/vio.c index ff93cff959f..bc286b2d2bb 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -87,7 +87,7 @@ static void vio_init(Vio* vio, enum enum_vio_type type, #ifdef HAVE_OPENSSL if (type == VIO_TYPE_SSL) { - vio->viodelete =vio_ssl_delete; + vio->viodelete =vio_delete; vio->vioerrno =vio_ssl_errno; vio->read =vio_ssl_read; vio->write =vio_ssl_write; diff --git a/vio/vio_priv.h b/vio/vio_priv.h index c1c78cc6efa..eb495025ddd 100644 --- a/vio/vio_priv.h +++ b/vio/vio_priv.h @@ -28,7 +28,6 @@ void vio_ignore_timeout(Vio *vio, uint which, uint timeout); #ifdef HAVE_OPENSSL #include "my_net.h" /* needed because of struct in_addr */ -void vio_ssl_delete(Vio* vio); int vio_ssl_read(Vio *vio,gptr buf, int size); int vio_ssl_write(Vio *vio,const gptr buf,int size); void vio_ssl_timeout(Vio *vio, uint which, uint timeout); diff --git a/vio/viossl.c b/vio/viossl.c index e6af07c4b0b..1273814c551 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -69,25 +69,6 @@ report_errors() DBUG_VOID_RETURN; } -/* - Delete a vio object - - SYNPOSIS - vio_ssl_delete() - vio Vio object. May be 0. -*/ - - -void vio_ssl_delete(Vio * vio) -{ - if (vio) - { - if (vio->type != VIO_CLOSED) - vio_close(vio); - my_free((gptr) vio,MYF(0)); - } -} - int vio_ssl_errno(Vio *vio __attribute__((unused))) { |