From 52c84d144d3b07966d9b3bab8694eb012eef69ce Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 12 Oct 2012 11:00:01 +0200 Subject: MDEV-3802: Millisecond timeout support in non-blocking client library + fix incorrect blocking. After the merge of VIO stuff from MySQL 5.6, there were some bugs left in the non-blocking client library: - vio_io_wait() was introduced without any support for non-blocking operation, so async queries could turn into sync. - Timeouts were changed to milliseconds, but this was not reflected in the non-blocking API, also semantics was changed so signed -1 was used for "no timeout" rather than unsigned 0. Fix by implementing and using my_io_wait_async() in the non-blocking case. And by introducing a new mysql_get_timeout_value_ms() API function that provides the timeout with millisecond granularity. The old mysql_get_timeout_value() is kept and fixed to work correctly, converting the timeout to whole seconds. --- include/mysql.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/mysql.h') diff --git a/include/mysql.h b/include/mysql.h index 6bbcdd96482..046d093dc47 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -852,6 +852,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 -- cgit v1.2.1