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

Merge branch '3.1' into 3.2

This commit is contained in:
Georg Richter
2021-03-14 12:03:07 +01:00

View File

@@ -2606,6 +2606,7 @@ static int test_bug5194(MYSQL *mysql)
const int uint16_max= 65535; const int uint16_max= 65535;
int nrows, i; int nrows, i;
SKIP_MAXSCALE;
stmt_text= "drop table if exists t1"; stmt_text= "drop table if exists t1";
rc= mysql_real_query(mysql, SL(stmt_text)); rc= mysql_real_query(mysql, SL(stmt_text));
@@ -4547,6 +4548,7 @@ static int test_conc217(MYSQL *mysql)
MYSQL_STMT *stmt= mysql_stmt_init(mysql); MYSQL_STMT *stmt= mysql_stmt_init(mysql);
int rc; int rc;
SKIP_MAXSCALE;
rc= mariadb_stmt_execute_direct(stmt, "SELECT 1 FROM nonexisting_table", -1); rc= mariadb_stmt_execute_direct(stmt, "SELECT 1 FROM nonexisting_table", -1);
FAIL_IF(rc==0, "Expected error\n"); FAIL_IF(rc==0, "Expected error\n");
rc= mysql_query(mysql, "drop table if exists t_count"); rc= mysql_query(mysql, "drop table if exists t_count");