diff options
| author | unknown <ramil@mysql.com> | 2005-03-30 17:07:40 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-03-30 17:07:40 +0500 |
| commit | 72aef9c2079eef3104d18e035a5de4ee2931b6a8 (patch) | |
| tree | 351ad59ed8e657c56594971ca07904b6ba65566a /vio | |
| parent | 32ff7adeb095f4fbdfc478478e661176d1724dee (diff) | |
| parent | 633a2468ec3407d1900b6cce276cc80a89d978a6 (diff) | |
| download | mariadb-git-72aef9c2079eef3104d18e035a5de4ee2931b6a8.tar.gz | |
Merge
include/violite.h:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Manual merge
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/test-ssl.c | 4 | ||||
| -rw-r--r-- | vio/test-sslclient.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vio/test-ssl.c b/vio/test-ssl.c index 88df6936a1f..a94eb1a21ff 100644 --- a/vio/test-ssl.c +++ b/vio/test-ssl.c @@ -115,7 +115,7 @@ main(int argc, char** argv) { /* child, therefore, client */ char xbuf[100]; - int r = client_vio->read(client_vio,xbuf, sizeof(xbuf)); + int r = vio_read(client_vio,xbuf, sizeof(xbuf)); if (r<=0) { my_free((gptr)ssl_acceptor,MYF(0)); my_free((gptr)ssl_connector,MYF(0)); @@ -130,7 +130,7 @@ main(int argc, char** argv) else { const char* s = "Huhuhuh"; - int r = server_vio->write(server_vio,(gptr)s, strlen(s)); + int r = vio_write(server_vio,(gptr)s, strlen(s)); if (r<=0) { my_free((gptr)ssl_acceptor,MYF(0)); my_free((gptr)ssl_connector,MYF(0)); diff --git a/vio/test-sslclient.c b/vio/test-sslclient.c index 231ce056d8c..3811ba0fb6a 100644 --- a/vio/test-sslclient.c +++ b/vio/test-sslclient.c @@ -77,13 +77,13 @@ main( int argc __attribute__((unused)), sa.sin_port = htons (1111); /* Server Port number */ err = connect(client_vio->sd, (struct sockaddr*) &sa, - sizeof(sa)); + sizeof(sa)); /* ----------------------------------------------- */ /* Now we have TCP conncetion. Start SSL negotiation. */ read(client_vio->sd,xbuf, sizeof(xbuf)); sslconnect(ssl_connector,client_vio,60L); - err = client_vio->read(client_vio,xbuf, sizeof(xbuf)); + err = vio_read(client_vio,xbuf, sizeof(xbuf)); if (err<=0) { my_free((gptr)ssl_connector,MYF(0)); fatal_error("client:SSL_read"); |