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

Build fixes for 10.2 integration

Browse Source
This commit is contained in:
Georg Richter
2016-03-01 13:54:33 +01:00
parent c433c30271
commit 89fce625b5
9 changed files with 61 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/libmariadb/basic-t.c
View File

@@ -395,7 +395,7 @@ static int test_bad_union(MYSQL *mysql)
*/
static int test_mysql_insert_id(MYSQL *mysql)
{
my_ulonglong res;
unsigned long long res;
int rc;
if (mysql_get_server_version(mysql) < 50100) {

2
unittest/libmariadb/misc.c
View File

@@ -51,7 +51,7 @@ static int test_bug28075(MYSQL *mysql)
static int test_bug28505(MYSQL *mysql)
{
my_ulonglong res;
unsigned long long res;
int rc;
rc= mysql_query(mysql, "drop table if exists t1");

6
unittest/libmariadb/ps_bugs.c
View File

@@ -1260,7 +1260,7 @@ static int test_bug23383(MYSQL *mysql)
const char *insert_query= "INSERT INTO t1 VALUES (1), (2)";
const char *update_query= "UPDATE t1 SET i= 4 WHERE i = 3";
MYSQL_STMT *stmt;
my_ulonglong row_count;
unsigned long long row_count;
int rc;
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
@@ -1277,7 +1277,7 @@ static int test_bug23383(MYSQL *mysql)
rc= mysql_query(mysql, insert_query);
FAIL_IF(!rc, "Error expected");
row_count= mysql_affected_rows(mysql);
FAIL_UNLESS(row_count == (my_ulonglong)-1, "rowcount != -1");
FAIL_UNLESS(row_count == (unsigned long long)-1, "rowcount != -1");
rc= mysql_query(mysql, update_query);
check_mysql_rc(rc, mysql);
@@ -1300,7 +1300,7 @@ static int test_bug23383(MYSQL *mysql)
rc= mysql_stmt_execute(stmt);
FAIL_UNLESS(rc != 0, "");
row_count= mysql_stmt_affected_rows(stmt);
FAIL_UNLESS(row_count == (my_ulonglong)-1, "rowcount != -1");
FAIL_UNLESS(row_count == (unsigned long long)-1, "rowcount != -1");
rc= mysql_stmt_prepare(stmt, update_query, strlen(update_query));
check_stmt_rc(rc, stmt);

2
unittest/libmariadb/result.c
View File

@@ -586,7 +586,7 @@ static int test_bug21726(MYSQL *mysql)
};
const char *update_query= "UPDATE t1 SET i= LAST_INSERT_ID(i + 1)";
int rc;
my_ulonglong insert_id;
unsigned long long insert_id;
const char *select_query= "SELECT * FROM t1";
MYSQL_RES *result;