diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-08 00:26:55 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-08 00:26:55 +0200 |
| commit | 2d0dd62cf7e824f5bbc8d0367730adcdaf0eed68 (patch) | |
| tree | 804b14fb55650c3af866d8bc19048594569e7f98 /tests | |
| parent | d30f17af4969cc1ce34f1925f5ea2bced9c6f7e9 (diff) | |
| parent | bf71d263621c90cbddc7bde9bf071dae503f333f (diff) | |
| download | mariadb-git-2d0dd62cf7e824f5bbc8d0367730adcdaf0eed68.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 6c5efd72c40..a3907636001 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -18503,6 +18503,7 @@ static void test_bug42373() DIE_UNLESS(rc == 1); mysql_stmt_close(stmt); + mysql_close(&con); /* Now try with a multi-statement. */ DIE_UNLESS(mysql_client_init(&con)); @@ -18965,8 +18966,6 @@ static void test_progress_reporting() conn= client_connect(CLIENT_PROGRESS_OBSOLETE, MYSQL_PROTOCOL_TCP, 0); - if (!(conn->server_capabilities & CLIENT_PROGRESS_OBSOLETE)) - return; DIE_UNLESS(conn->client_flag & CLIENT_PROGRESS_OBSOLETE); mysql_options(conn, MYSQL_PROGRESS_CALLBACK, (void*) report_progress); @@ -20363,6 +20362,7 @@ static void test_bulk_delete() DIE_IF(atoi(row[0]) != 3); } DIE_IF(i != 1); + mysql_free_result(result); rc= mysql_query(mysql, "DROP TABLE t1"); myquery(rc); |