diff options
| author | unknown <lars@mysql.com> | 2005-05-09 11:45:59 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-05-09 11:45:59 +0200 |
| commit | 14b614e16414acc996a932c73f3d0a8e4e83538a (patch) | |
| tree | 075608ca4d88921bffb8479717d99dadb29f3770 /vio/viossl.c | |
| parent | 383c19a0442f914b18e5f146f5adfa78359ec5f2 (diff) | |
| parent | 848611b5ed1e565d02eea896e22753b818c458c5 (diff) | |
| download | mariadb-git-14b614e16414acc996a932c73f3d0a8e4e83538a.tar.gz | |
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BUILD/FINISH.sh:
Auto merged
BUILD/compile-dist:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/ndb/src/cw/cpcd/Process.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
Diffstat (limited to 'vio/viossl.c')
| -rw-r--r-- | vio/viossl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 400d8842fd3..4233b276346 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -424,7 +424,8 @@ int vio_ssl_blocking(Vio * vio __attribute__((unused)), void vio_ssl_timeout(Vio *vio __attribute__((unused)), - uint timeout __attribute__((unused))) + uint which __attribute__((unused)), + uint timeout __attribute__((unused))) { /* Not yet implemented (non critical) */ } |