From 73e6afbc0c8df01e6d70bedaff6ba1dc34ddb13c Mon Sep 17 00:00:00 2001
From: Lawrin Novitsky <lawrin.novitsky@mariadb.com>
Date: Mon, 4 Nov 2024 10:33:09 +0100
Subject: [PATCH] Copied travis.yml from 1.1

Fixed warning in LoggerFactory
---
 .travis.yml                  | 99 +++---------------------------------
 src/logger/LoggerFactory.cpp |  2 +-
 2 files changed, 9 insertions(+), 92 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d4347c9..4c8afdb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,118 +1,35 @@
-os: linux
-dist: jammy
-sudo: true
 language: c
-services: docker
-addons:
-  hosts:
-    - mariadb.example.com
+version: ~> 1.0
+sudo: true
 
 cache:
   apt: true
   ccache: true
-  directories:
-    - $HOME/docker
 
-before_install:
-  - git clone https://github.com/mariadb-corporation/connector-test-machine.git
-  # Load cached docker images
-  - if [[ -d $HOME/docker ]]; then ls $HOME/docker/*.tar.gz | xargs -I {file} sh -c "zcat {file} | docker load"; fi
+env:
+  global: local=0 PROFILE=default DB=testcpp CLEAR_TEXT=0
 
-install:
-  - |-
-    if [ -z "$server_branch" ] ; then
-      case $TRAVIS_OS_NAME in
-        windows)
-          connector-test-machine/launch.bat -t "$srv" -v "$v" -d testcpp
-          ;;
-        linux)
-          source connector-test-machine/launch.sh -t "$srv" -v "$v" -d testcpp -l "$local" -n "$native"
-          ;;
-      esac
-    fi
-
-
-env: local=0
-
-stages:
-  - Minimal
-  - name: Enterprise
-    if: type = push AND fork = false
-  - Community
+import: mariadb-corporation/connector-test-machine:common-build.yml@master
 
 jobs:
-  fast_finish: true
   allow_failures:
     - env: srv=build
-    - env: srv=xpand
-    - env: srv=mysql v=5.7
-    - env: srv=mysql v=8.0
-    - env: srv=mariadb v=10.6
-      os: windows
     - os: osx
     - os: linux
       arch: s390x
       dist: focal
-    - env: srv=maxscale MAXSCALE_TEST_DISABLE=true
-    - env: srv=xpand
-#    - env: srv=skysql SKYSQL=true
-#    - env: srv=skysql-ha SKYSQL_HA=true MAXSCALE_TEST_DISABLE=true
   include:
-    - stage: Minimal
-      env: srv=mariadb v=10.6 local=1
-      name: "CS 10.6"
-    - env: srv=mariadb-es v=10.6
-      name: "ES 10.6"
-      if: type = push AND fork = false
-
-    - stage: Enterprise
-      env: srv=mariadb-es v=10.4
-      name: "ES 10.4"
-    - env: srv=mariadb-es v=10.5
-      name: "ES 10.5"
-      #    - env: srv=mariadb v=10.6 local=1 BENCH=true
-      #name: "benchmark"
-    - env: srv=mariadb-es-test v=23.08
-      name: "ES 23.08"
-      if: type = push AND fork = false
-    - env: srv=maxscale MAXSCALE_TEST_DISABLE=true
-      name: "Maxscale"
-#    - env: srv=skysql SKYSQL=true
-#      name: "SkySQL"
-#    - env: srv=skysql-ha SKYSQL_HA=true MAXSCALE_TEST_DISABLE=true
-#      name: "SkySQL with replication"
-    - env: srv=xpand
-      name: "Xpand"
-
     - stage: Community
-      env: srv=mariadb v=10.4
-      os: windows
-      language: shell
-      name: "CS 10.4 - Windows"
-    - env: srv=mariadb v=10.11 local=1
-      name: "CS 10.11"
-    - env: srv=mariadb v=10.5 local=1
-      name: "CS 10.5"
-    - env: srv=mariadb v=11.0 local=1
-      name: "CS 11.0"
-    - env: srv=mariadb v=11.1 local=1
-      name: "CS 11.1"
-    - env: srv=mariadb v=11.2 local=1
-      name: "CS 11.2"
-    - env: srv=mysql v=5.7
-      name: "MySQL 5.7"
-    - env: srv=mysql v=8.0
-      name: "MySQL 8.0"
-    - env: srv=build
-      name: "CS build"
-    - os: osx
+      os: osx
       compiler: clang
       before_script:
         - brew install openssl
         - brew install libiodbc
+      name: "osx"
     - os: linux
       arch: s390x
       dist: focal
       env: srv=mariadb v=10.11 local=1
+      name: "s390x"
 
 script: ./travis.sh
diff --git a/src/logger/LoggerFactory.cpp b/src/logger/LoggerFactory.cpp
index b659fec..2be1e02 100644
--- a/src/logger/LoggerFactory.cpp
+++ b/src/logger/LoggerFactory.cpp
@@ -25,7 +25,7 @@ namespace sql
 {
 namespace mariadb
 {
-  Shared::Logger LoggerFactory::NO_LOGGER= (NO_LOGGER ? NO_LOGGER : Shared::Logger(new NoLogger()));
+  Shared::Logger LoggerFactory::NO_LOGGER;
   bool LoggerFactory::hasToLog= false;
 
   void LoggerFactory::init(bool mustLog)