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

Fixed compiler warnings (introduced by changeset b78ba1b251)

Browse Source
This commit is contained in:
Georg Richter
2021-06-24 11:27:07 +02:00
parent 367c53a26f
commit 9661ddaefb
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unittest/libmariadb/charset.c
View File

@@ -790,12 +790,13 @@ static int charset_auto(MYSQL *my __attribute__((unused)))
/* check if all server character sets are supported */
static int test_conc223(MYSQL *mysql)
{
SKIP_MYSQL(mysql);
int rc;
MYSQL_RES *res;
MYSQL_ROW row;
int found= 0;
SKIP_MYSQL(mysql);
rc= mysql_query(mysql, "SELECT ID, CHARACTER_SET_NAME, COLLATION_NAME FROM INFORMATION_SCHEMA.COLLATIONS");
check_mysql_rc(rc, mysql);

5
unittest/libmariadb/connection.c
View File

@@ -1723,7 +1723,7 @@ static int test_conc366(MYSQL *mysql)
if (mysql_get_server_version(mysql) < 100400) {
sprintf(query, "CREATE OR REPLACE USER 'ede'@'%s' IDENTIFIED VIA ed25519 USING '6aW9C7ENlasUfymtfMvMZZtnkCVlcb1ssxOLJ0kj/AA'", this_host);
} else {
sprintf(query, "CREATE OR REPLACE USER 'ede'@'%s' IDENTIFIED VIA ed25519 USING PASSWORD('MySup8%rPassw@ord')", this_host);
sprintf(query, "CREATE OR REPLACE USER 'ede'@'%s' IDENTIFIED VIA ed25519 USING PASSWORD('MySup8%%rPassw@ord')", this_host);
}
rc= mysql_query(mysql, query);
check_mysql_rc(rc, mysql);
@@ -1754,12 +1754,13 @@ static int test_conc366(MYSQL *mysql)
static int test_conc392(MYSQL *mysql)
{
SKIP_MYSQL(mysql);
int rc;
const char *data;
size_t len;
ulong capabilities= 0;
SKIP_MYSQL(mysql);
mariadb_get_infov(mysql, MARIADB_CONNECTION_SERVER_CAPABILITIES, &capabilities);
if (!(capabilities & CLIENT_SESSION_TRACKING))
{

2
unittest/libmariadb/cursor.c
View File

@@ -283,11 +283,11 @@ static int test_cursors_with_union(MYSQL *mysql)
static int test_cursors_with_procedure(MYSQL *mysql)
{
SKIP_MYSQL(mysql);
const char *queries[]=
{
"SELECT * FROM t1 procedure analyse()"
};
SKIP_MYSQL(mysql);
FAIL_IF(fetch_n(mysql, queries, sizeof(queries)/sizeof(*queries), USE_ROW_BY_ROW_FETCH), "fetch_n failed");
FAIL_IF(fetch_n(mysql, queries, sizeof(queries)/sizeof(*queries), USE_STORE_RESULT), "fetch_n failed");

2
unittest/libmariadb/ps_bugs.c
View File

@@ -674,11 +674,11 @@ static int test_bug1500(MYSQL *mysql)
static int test_bug15510(MYSQL *mysql)
{
SKIP_MYSQL(mysql);
MYSQL_STMT *stmt;
int rc;
const char *query= "select 1 from dual where 1/0";
SKIP_MYSQL(mysql);
rc= mysql_query(mysql, "set @@sql_mode='ERROR_FOR_DIVISION_BY_ZERO'");
check_mysql_rc(rc, mysql);