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

travis fix:

Browse Source 
remove server builds > 10.5, since 10.6 and above use
Connector/C 3.3 branch.
This commit is contained in:
Georg Richter
2023-04-22 06:56:53 +02:00
parent 0e452f66ac
commit 6c29921bbe
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@@ -50,7 +50,6 @@ jobs:
env: srv=mariadb-es v=10.5 env: srv=mariadb-es v=10.5
- if: type = push AND fork = false - if: type = push AND fork = false
env: srv=maxscale env: srv=maxscale
- if: type = push AND fork = false
- env: srv=mysql v=5.7 native=1 - env: srv=mysql v=5.7 native=1
- env: srv=mysql v=8.0 native=1 - env: srv=mysql v=8.0 native=1
- if: type = push AND fork = false - if: type = push AND fork = false
@@ -59,9 +58,5 @@ jobs:
env: srv=skysql-ha env: srv=skysql-ha
- env: server_branch=10.5 - env: server_branch=10.5
- env: server_branch=10.5 TEST_OPTION=--ps-protocol - env: server_branch=10.5 TEST_OPTION=--ps-protocol
- env: server_branch=10.6
- env: server_branch=10.6 TEST_OPTION=--ps-protocol
- env: server_branch=10.11
- env: server_branch=10.11 TEST_OPTION=--ps-protocol
script: ./travis.sh script: ./travis.sh

6
unittest/libmariadb/connection.c
View File

@@ -618,6 +618,12 @@ int test_conc21(MYSQL *mysql)
int major=0, minor= 0, patch=0; int major=0, minor= 0, patch=0;
SKIP_MAXSCALE; SKIP_MAXSCALE;
if (strlen(mysql_get_server_info(mysql)) > 63)
{
diag("server name is too long - skip until rpl hack was removed");
return SKIP;
}
rc= mysql_query(mysql, "SELECT @@version"); rc= mysql_query(mysql, "SELECT @@version");
check_mysql_rc(rc, mysql); check_mysql_rc(rc, mysql);