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 /mysql-test | |
| 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 'mysql-test')
| -rw-r--r-- | mysql-test/r/non_blocking_api.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysql_client_test_nonblock.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/non_blocking_api.test | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/r/non_blocking_api.result b/mysql-test/r/non_blocking_api.result index 470e3e067f6..248e372593b 100644 --- a/mysql-test/r/non_blocking_api.result +++ b/mysql-test/r/non_blocking_api.result @@ -1,3 +1,4 @@ +drop table if exists t1; CREATE TABLE t1 (a INT PRIMARY KEY); INSERT INTO t1 VALUES (1); SELECT * FROM t1; diff --git a/mysql-test/t/mysql_client_test_nonblock.test b/mysql-test/t/mysql_client_test_nonblock.test index f212fe6abda..fc2e0b1d01b 100644 --- a/mysql-test/t/mysql_client_test_nonblock.test +++ b/mysql-test/t/mysql_client_test_nonblock.test @@ -1,6 +1,6 @@ # This runs the mysql_client_test using the non-blocking API. -# This test should work in embedded server after we fix mysqltest +# The non-blocking API is not supported in the embedded server. -- source include/not_embedded.inc SET @old_general_log= @@global.general_log; diff --git a/mysql-test/t/non_blocking_api.test b/mysql-test/t/non_blocking_api.test index b9909a1c8a4..b6b43427a76 100644 --- a/mysql-test/t/non_blocking_api.test +++ b/mysql-test/t/non_blocking_api.test @@ -1,5 +1,9 @@ # Test mixing the use of blocking and non-blocking API in a single connection. +--disable_warnings +drop table if exists t1; +--enable_warnings + --enable_non_blocking_api connect (con_nonblock,localhost,root,,test); --disable_non_blocking_api |