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

Merge branch '3.1' into 3.2-diego

Browse Source 
# Conflicts:
#	.travis.yml
#	unittest/libmariadb/charset.c
#	unittest/libmariadb/connection.c
This commit is contained in:
kolzeq
2021-06-17 10:54:30 +02:00
parent 85c3742252 367c53a26f
commit 25e38080cb
26 changed files with 260 additions and 1301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unittest/libmariadb/ps_bugs.c
View File

@@ -674,6 +674,7 @@ 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";
@@ -2070,7 +2071,7 @@ static int test_bug36004(MYSQL *mysql)
int rc, warning_count= 0;
MYSQL_STMT *stmt;
SKIP_MAXSCALE;
SKIP_MYSQL(mysql); // don't send expected warnings
if (mysql_get_server_version(mysql) < 60000) {
diag("Test requires MySQL Server version 6.0 or above");