From 5455979f87cf16677a9d7160267e1c85538e6185 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 27 Jun 2024 19:27:17 +0200
Subject: [PATCH] Had a typo in the mysql option copying

---
 .github/workflows/github_action_test_suite.yml |  4 ++--
 .github/workflows/mysql_settings.py            | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml
index 39f8b82495..aff2006273 100644
--- a/.github/workflows/github_action_test_suite.yml
+++ b/.github/workflows/github_action_test_suite.yml
@@ -68,8 +68,8 @@ jobs:
       - name: Set MySQL custom options
         if: ${{ matrix.TESTING_DB == 'mysql' }}
         run: |
-          sudo cp ${{ github.workspace }}/.github/workflows/mysql_options.cnf /etc/mysql/custom.cnf
-          sudo chown -R mysql:mysql /etc/mysql/custom.cnf
+          sudo cp ${{ github.workspace }}/.github/workflows/mysql_options.cnf /etc/mysql/conf.d/custom.cnf
+          sudo chown -R mysql:mysql /etc/mysql/conf.d/custom.cnf
 
       # - name: Set up database (${{ matrix.TESTING_DB }})
       #   uses: ./.github/actions/setup-database
diff --git a/.github/workflows/mysql_settings.py b/.github/workflows/mysql_settings.py
index 7ffa74c347..7541fa04cc 100644
--- a/.github/workflows/mysql_settings.py
+++ b/.github/workflows/mysql_settings.py
@@ -48,15 +48,15 @@ DATABASES = {
         "PORT": os.environ.get("MYSQL_PORT", "3306"),
         "OPTIONS": {
              "charset": "utf8mb4",
-             "init_command": "set collation_connection=utf8mb4_unicode_ci",
+#             "init_command": "set collation_connection=utf8mb4_unicode_ci",
          },
-        "TEST": {
-            "NAME": "evennia",
-            "OPTIONS": {
-                "charset": "utf8mb4",
-                "init_command": "set collation_connection=utf8mb4_unicode_ci",
-            },
-        },
+#        "TEST": {
+#            "NAME": "evennia",
+#            "OPTIONS": {
+#                "charset": "utf8mb4",
+#                "init_command": "set collation_connection=utf8mb4_unicode_ci",
+#            },
+#        },
     }
 }