From 5b82ca23d3c15a534d3a48d4e4fbbc036416b865 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 3 Dec 2020 17:21:53 +0100
Subject: [PATCH] [ticket/16659] Remove special definitions for mariadb setup

PHPBB3-16659
---
 .github/workflows/tests.yml | 1 -
 travis/setup-database.sh    | 5 -----
 travis/setup-phpbb.sh       | 9 ---------
 3 files changed, 15 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 46cd9cb718..39b04bb9fd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -66,7 +66,6 @@ jobs:
                 ports:
                     - 3306:3306
                 options: >-
-                    -v /srv/docker/sockets/mariadb:/var/run/mysqld
                     --health-cmd="mysqladmin ping"
                     --health-interval=10s
                     --health-timeout=5s
diff --git a/travis/setup-database.sh b/travis/setup-database.sh
index 602d55678e..0a4085158d 100755
--- a/travis/setup-database.sh
+++ b/travis/setup-database.sh
@@ -30,8 +30,3 @@ if [ "$TRAVIS_PHP_VERSION" == "5.6" -a "$DB" == "mysql" ]
 then
 	mysql -e 'SET GLOBAL storage_engine=MyISAM;'
 fi
-
-if [ "$DB" == "mariadb" ]
-then
-	mysql -e 'create database IF NOT EXISTS phpbb_tests;'
-fi
diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh
index 9bf19242ca..a6e51b5ed9 100755
--- a/travis/setup-phpbb.sh
+++ b/travis/setup-phpbb.sh
@@ -22,15 +22,6 @@ then
 	travis/setup-unbuffer.sh
 fi
 
-if [ "$DB" == "mariadb" ]
-then
-	ls -l /var/run | grep -i mysqld
-
-	if [ ! -f "/var/run/mysqld/mysqld.sock" ]; then
-		ln -s /srv/docker/sockets/mariadb/mysqld.sock /var/run/mysqld/mysqld.sock
-	fi
-fi
-
 if [ "$MYSQL8" == '1' ]
 then
 	travis/setup-mysql8.sh