From 51920cbbf3183f6d5ae519d803ebb9bf84bf2d93 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Tue, 7 Aug 2018 07:16:42 +0200 Subject: [PATCH] Travis test fix for CONC-351: skip test if the server doesn't support session tracking --- unittest/libmariadb/connection.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c index 3f372afa..c1eadd3f 100644 --- a/unittest/libmariadb/connection.c +++ b/unittest/libmariadb/connection.c @@ -1534,12 +1534,21 @@ static int test_conc351(MYSQL *unused __attribute__((unused))) const char *data; size_t len; MYSQL *mysql= mysql_init(NULL); + ulong capabilities= 0; my_test_connect(mysql, hostname, username, password, schema, port, socketname, 0); FAIL_IF(mysql_errno(mysql), "Error during connect"); + mariadb_get_infov(mysql, MARIADB_CONNECTION_SERVER_CAPABILITIES, &capabilities); + if (!(capabilities & CLIENT_SESSION_TRACKING)) + { + mysql_close(mysql); + diag("Server doesn't support session tracking (cap=%lu)", mysql->server_capabilities); + return SKIP; + } + FAIL_IF(mysql_session_track_get_first(mysql, SESSION_TRACK_SCHEMA, &data, &len), "expected session track schema"); rc= mysql_query(mysql, "SET @a:=1");