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

Fix some conversion warnings.

Browse Source 
Exclude definitions from my_config.h that conflict with server's config.h
(most of ma_config.h is not used by connector anyway)

Avoid overriding server's SIGN_TARGET() macro, if used as subproject.
Make WITH_UNIT_TESTS exclude unit tests, like it is for the server.
This commit is contained in:
Vladislav Vaintroub
2017-09-30 21:45:56 +00:00
parent 9d1a7aeede
commit 931450c3f8
6 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/libmariadb/connection.c
View File

@@ -1063,7 +1063,7 @@ static int test_auth256(MYSQL *my)
MYSQL *mysql= mysql_init(NULL);
int rc;
MYSQL_RES *res;
int num_rows= 0;
my_ulonglong num_rows= 0;
rc= mysql_query(my, "SELECT * FROM information_schema.plugins where plugin_name='sha256_password'");
check_mysql_rc(rc, mysql);

2
unittest/libmariadb/ps_bugs.c
View File

@@ -2699,7 +2699,7 @@ static int test_bug5194(MYSQL *mysql)
}
*query_ptr= '\0';
rc= mysql_stmt_prepare(stmt, query, query_ptr - query);
rc= mysql_stmt_prepare(stmt, query, (ulong)(query_ptr - query));
if (rc && nrows * COLUMN_COUNT > uint16_max) /* expected error */
break;