diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-01-06 12:43:18 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-01-06 12:43:18 +0100 |
| commit | 17940b652d0a078f5a28b089aa0f5362756d438e (patch) | |
| tree | 0c198251f33fd1b19ae2bb443a732496a3bf5ee3 /tests/mysql_client_test.c | |
| parent | a5b881594da4258257b18cc42f5ce7be3524e02c (diff) | |
| download | mariadb-git-17940b652d0a078f5a28b089aa0f5362756d438e.tar.gz | |
MWL#192: non-blocking client API, after-review fixes.
Main change is that non-blocking operation is now an option that must be
explicitly enabled with mysql_option(mysql, MYSQL_OPT_NONBLOCK, ...)
before any non-blocing operation can be used.
Also the CLIENT_REMEMBER_OPTIONS flag is now always enabled and thus
effectively ignored (it was not really useful anyway, and this simplifies
things when non-blocking mysql_real_connect() fails).
Diffstat (limited to 'tests/mysql_client_test.c')
| -rw-r--r-- | tests/mysql_client_test.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 1ca70fd972a..8ceeaf57399 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -260,6 +260,8 @@ static MYSQL *mysql_client_init(MYSQL* con) if (res && shared_memory_base_name) mysql_options(res, MYSQL_SHARED_MEMORY_BASE_NAME, shared_memory_base_name); #endif + if (res && non_blocking_api_enabled) + mysql_options(res, MYSQL_OPT_NONBLOCK, 0); return res; } |