diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-03 14:04:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-12 17:51:50 +0200 |
| commit | ece01ef3dc89d20198efbaec40e7114fdb515338 (patch) | |
| tree | 7f3c1f1ee812b8bf8fa98fee94103dae4d7afa0d /tests | |
| parent | 12067633fb44205777e2e9f401bbcb3242bafd66 (diff) | |
| download | mariadb-git-ece01ef3dc89d20198efbaec40e7114fdb515338.tar.gz | |
After-review changes
* remove redundant code
* fix tests
* move declarations and defines where they belong
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 7 | ||||
| -rw-r--r-- | tests/nonblock-wrappers.h | 38 |
2 files changed, 2 insertions, 43 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 76db1f62f85..66955a14fa5 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -6350,19 +6350,16 @@ static void test_pure_coverage() rc= mysql_stmt_execute(stmt); check_execute(stmt, rc); -#if 0 - /* MariaDB C/C converts geometry to string */ my_bind[0].buffer_type= MYSQL_TYPE_GEOMETRY; rc= mysql_stmt_bind_result(stmt, my_bind); - check_execute_r(stmt, rc); /* unsupported buffer type */ + check_execute(stmt, rc); /* MariaDB C/C converts geometry to string */ rc= mysql_stmt_store_result(stmt); - DIE_UNLESS(rc); + DIE_IF(rc); rc= mysql_stmt_store_result(stmt); DIE_UNLESS(rc); /* Old error must be reset first */ -#endif mysql_stmt_close(stmt); mysql_query(mysql, "DROP TABLE test_pure"); diff --git a/tests/nonblock-wrappers.h b/tests/nonblock-wrappers.h index fd50e4e4ee6..78851854442 100644 --- a/tests/nonblock-wrappers.h +++ b/tests/nonblock-wrappers.h @@ -321,44 +321,6 @@ MK_WRAPPER( mysql, mysql) -#ifdef HAVE_DEPRECATED_ASYNC_API -MK_WRAPPER( - MYSQL_RES *, - mysql_list_dbs, - (MYSQL *mysql, const char *wild), - (&res, mysql, wild), - (mysql, wild), - mysql, - mysql) - -MK_WRAPPER( - MYSQL_RES *, - mysql_list_tables, - (MYSQL *mysql, const char *wild), - (&res, mysql, wild), - (mysql, wild), - mysql, - mysql) - -MK_WRAPPER( - MYSQL_RES *, - mysql_list_processes, - (MYSQL *mysql), - (&res, mysql), - (mysql), - mysql, - mysql) - -MK_WRAPPER( - MYSQL_RES *, - mysql_list_fields, - (MYSQL *mysql, const char *table, const char *wild), - (&res, mysql, table, wild), - (mysql, table, wild), - mysql, - mysql) -#endif /* HAVE_DEPRECATED_ASYNC_API */ - MK_WRAPPER( my_bool, mysql_read_query_result, |