diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-10-12 10:54:46 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-10-12 10:54:46 +0200 |
| commit | fc941f8a2143ce7670f49c2638f352c16f4b9ddb (patch) | |
| tree | 34dbc9fba4d7889db3d6b12ebb2d251326bced9f /include | |
| parent | 8215ce4695e743d313e92f4d30f412f79958439c (diff) | |
| download | mariadb-git-fc941f8a2143ce7670f49c2638f352c16f4b9ddb.tar.gz | |
MDEV-3802. Millisecond timeout support in non-blocking client library.
In 10.0, VIO timeouts can be in milliseconds, so we add a new function
mysql_get_timeout_value_ms() which can return millisecond-precision
timeout values.
In 5.5, we do not have millisecond precision for timeouts. But we still
provide the mysql_get_timeout_value_ms() function; this makes it easier
for applications as they can use the millisecond function in 10.0 and
still work with the 5.5 version of the client library.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 1 | ||||
| -rw-r--r-- | include/mysql.h.pp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h index d71d049f69d..1fc164f62b2 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -848,6 +848,7 @@ int STDCALL mysql_close_start(MYSQL *sock); int STDCALL mysql_close_cont(MYSQL *sock, int status); my_socket STDCALL mysql_get_socket(const MYSQL *mysql); unsigned int STDCALL mysql_get_timeout_value(const MYSQL *mysql); +unsigned int STDCALL mysql_get_timeout_value_ms(const MYSQL *mysql); /* status return codes */ #define MYSQL_NO_DATA 100 diff --git a/include/mysql.h.pp b/include/mysql.h.pp index ce577146581..48ce79046ff 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -729,3 +729,4 @@ int mysql_close_start(MYSQL *sock); int mysql_close_cont(MYSQL *sock, int status); my_socket mysql_get_socket(const MYSQL *mysql); unsigned int mysql_get_timeout_value(const MYSQL *mysql); +unsigned int mysql_get_timeout_value_ms(const MYSQL *mysql); |