1
0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00

Merge 3.1 into 3.2

This commit is contained in:
Marko Mäkelä
2021-08-31 10:28:30 +03:00
2 changed files with 4 additions and 8 deletions

View File

@@ -210,12 +210,6 @@ int fetch_n(MYSQL *mysql, const char **query_list, unsigned query_count,
}
}
}
if (!error_count)
{
unsigned total_row_count= 0;
for (fetch= fetch_array; fetch < fetch_array + query_count; ++fetch)
total_row_count+= fetch->row_count;
}
for (fetch= fetch_array; fetch < fetch_array + query_count; ++fetch)
stmt_fetch_close(fetch);
free(fetch_array);
@@ -1505,6 +1499,8 @@ static int test_bug38486(MYSQL *mysql)
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t10");
check_mysql_rc(rc, mysql);
mysql_stmt_close(stmt);
rc= mysql_query(mysql, "DROP TABLE t10");