From 2e5e1de9ce4f0fca2535ee3b0552dbdca030a30b Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 19 Dec 2025 14:37:41 +0100
Subject: [PATCH] CI: More testing with custom mysql.cnf file

---
 .github/actions/setup-database/action.yml | 37 ++++++++++++++++-------
 .github/workflows/mysql.cnf               |  5 +++
 .github/workflows/mysql_settings.py       |  4 ++-
 3 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/mysql.cnf

diff --git a/.github/actions/setup-database/action.yml b/.github/actions/setup-database/action.yml
index 03c029d9df..ab1e10c05a 100644
--- a/.github/actions/setup-database/action.yml
+++ b/.github/actions/setup-database/action.yml
@@ -46,24 +46,39 @@ runs:
     - name: Set up MySQL Configuration and Privileges
       if: ${{ inputs.database == 'mysql' }}
       run: |
-        # Set MySQL global variables for character set, collation, and row format
-        # These must be set before migrations run to ensure tables are created with correct settings
+        # Create MySQL config file inside the container and restart MySQL to apply settings
+        # This ensures settings are applied at server startup, similar to command-line arguments
+        CONTAINER_ID=$(docker ps --filter "ancestor=mysql:8.0" --format "{{.ID}}" | head -1)
+        if [ -n "$CONTAINER_ID" ]; then
+          # Create config file in container
+          docker exec $CONTAINER_ID sh -c 'printf "[mysqld]\ncharacter-set-server=utf8mb4\ncollation-server=utf8mb4_unicode_ci\ninnodb-default-row-format=DYNAMIC\n" > /etc/mysql/conf.d/custom.cnf'
+          # Restart MySQL to apply config (graceful shutdown and start)
+          docker exec $CONTAINER_ID sh -c 'mysqladmin -u root -proot_password shutdown' || true
+          sleep 2
+          docker start $CONTAINER_ID
+          # Wait for MySQL to be ready again
+          until mysqladmin ping -h 127.0.0.1 -u root -proot_password --silent; do
+            sleep 1
+            echo -n .
+          done
+        fi
+        # Also set global variables as a fallback (though config file should handle this)
         mysql -u root -proot_password -h 127.0.0.1 mysql <<EOF
-          SET GLOBAL character_set_server = 'utf8mb4';
-          SET GLOBAL collation_server = 'utf8mb4_unicode_ci';
-          SET GLOBAL innodb_default_row_format = 'DYNAMIC';
+        SET GLOBAL character_set_server = 'utf8mb4';
+        SET GLOBAL collation_server = 'utf8mb4_unicode_ci';
+        SET GLOBAL innodb_default_row_format = 'DYNAMIC';
         EOF
         # Ensure user exists and has proper privileges
         mysql -u root -proot_password -h 127.0.0.1 mysql <<EOF
-          CREATE USER IF NOT EXISTS 'evennia'@'%' IDENTIFIED BY 'password';
-          GRANT ALL PRIVILEGES ON \`evennia%\`.* TO 'evennia'@'%';
-          GRANT PROCESS ON *.* TO 'evennia'@'%';
-          GRANT SESSION_VARIABLES_ADMIN ON *.* TO 'evennia'@'%';
-          FLUSH PRIVILEGES;
+        CREATE USER IF NOT EXISTS 'evennia'@'%' IDENTIFIED BY 'password';
+        GRANT ALL PRIVILEGES ON \`evennia%\`.* TO 'evennia'@'%';
+        GRANT PROCESS ON *.* TO 'evennia'@'%';
+        GRANT SESSION_VARIABLES_ADMIN ON *.* TO 'evennia'@'%';
+        FLUSH PRIVILEGES;
         EOF
         # Set database character set and collation
         mysql -u root -proot_password -h 127.0.0.1 evennia <<EOF
-          ALTER DATABASE evennia CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+        ALTER DATABASE evennia CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
         EOF
       shell: bash
 
diff --git a/.github/workflows/mysql.cnf b/.github/workflows/mysql.cnf
new file mode 100644
index 0000000000..80e9c867c0
--- /dev/null
+++ b/.github/workflows/mysql.cnf
@@ -0,0 +1,5 @@
+[mysqld]
+character-set-server=utf8mb4
+collation-server=utf8mb4_unicode_ci
+innodb-default-row-format=DYNAMIC
+
diff --git a/.github/workflows/mysql_settings.py b/.github/workflows/mysql_settings.py
index 1973862e9e..9fb4213a33 100644
--- a/.github/workflows/mysql_settings.py
+++ b/.github/workflows/mysql_settings.py
@@ -48,7 +48,9 @@ DATABASES = {
         "PORT": "",  # use default port
         "OPTIONS": {
             "charset": "utf8mb4",
-            # Note: MySQL server is configured with utf8mb4 and DYNAMIC row format at startup
+            # Note: MySQL server global settings (character set, collation, row format) are set
+            # in setup-database action before migrations run. The init_command sets per-connection
+            # variables that don't require special privileges.
             "init_command": (
                 "SET collation_connection=utf8mb4_unicode_ci, "
                 "sql_mode='STRICT_TRANS_TABLES', innodb_strict_mode=1"