From a17e73f9530ce611f89312c19f83e05335505970 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Thu, 10 Sep 2020 16:30:04 +0200 Subject: [PATCH] Skip test_conc496 if session_tracking_transaction_info variable is not available/supported. --- unittest/libmariadb/connection.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c index c4fb1880..8fd24335 100644 --- a/unittest/libmariadb/connection.c +++ b/unittest/libmariadb/connection.c @@ -998,6 +998,13 @@ static int test_conc496(MYSQL *mysql) size_t len; rc= mysql_query(mysql, "set @@session.session_track_transaction_info=STATE"); + + if (rc && mysql_errno(mysql) == ER_UNKNOWN_SYSTEM_VARIABLE) + { + diag("session_track_transaction_info not supported"); + return SKIP; + } + check_mysql_rc(rc, mysql); rc= mysql_query(mysql, "BEGIN"); @@ -1035,6 +1042,7 @@ static int test_unix_socket_close(MYSQL *unused __attribute__((unused))) int i; SKIP_SKYSQL; + SKIP_TRAVIS(); if (!(fp= fopen("./dummy_sock", "w"))) {