From 18edb0959fe5384673ebd36d72029fa8003ff5d9 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Sat, 25 May 2024 10:08:09 +0400 Subject: [PATCH] Fixing mariadb-install-db.exe failure on Windows (Illegal mix of collations) --- scripts/fill_help_tables.sql | 2 +- scripts/mariadb_performance_tables.sql | 2 ++ scripts/mariadb_system_tables.sql | 2 ++ scripts/mariadb_system_tables_data.sql | 2 ++ scripts/mariadb_test_db.sql | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/fill_help_tables.sql b/scripts/fill_help_tables.sql index 8b61085ef59..e5bcd336ea0 100644 --- a/scripts/fill_help_tables.sql +++ b/scripts/fill_help_tables.sql @@ -22,7 +22,7 @@ -- mysql -u root -p mysql < file_name -set names 'utf8'; +SET NAMES utf8mb3 COLLATE utf8mb3_general_ci; set sql_log_bin = 0; diff --git a/scripts/mariadb_performance_tables.sql b/scripts/mariadb_performance_tables.sql index bf5f86489cc..86daf8d42e0 100644 --- a/scripts/mariadb_performance_tables.sql +++ b/scripts/mariadb_performance_tables.sql @@ -9,6 +9,8 @@ -- performance schema engine. -- +SET NAMES latin1 COLLATE latin1_swedish_ci; + set @have_old_pfs= (select count(*) from information_schema.schemata where schema_name='performance_schema'); SET @cmd="SET @broken_tables = (select count(*) from information_schema.tables where engine != 'PERFORMANCE_SCHEMA' and table_schema='performance_schema')"; diff --git a/scripts/mariadb_system_tables.sql b/scripts/mariadb_system_tables.sql index 4579385b5fb..cd982e78642 100644 --- a/scripts/mariadb_system_tables.sql +++ b/scripts/mariadb_system_tables.sql @@ -18,6 +18,8 @@ -- The system tables of MySQL Server -- +SET NAMES latin1 COLLATE latin1_swedish_ci; + set sql_mode=''; set @orig_storage_engine=@@default_storage_engine; diff --git a/scripts/mariadb_system_tables_data.sql b/scripts/mariadb_system_tables_data.sql index 85489e7866e..bdea83b4f85 100644 --- a/scripts/mariadb_system_tables_data.sql +++ b/scripts/mariadb_system_tables_data.sql @@ -17,6 +17,8 @@ -- The initial data for system tables of MySQL Server -- +SET NAMES latin1 COLLATE latin1_swedish_ci; + -- When setting up a "cross bootstrap" database (e.g., creating data on a Unix -- host which will later be included in a Windows zip file), any lines -- containing "@current_hostname" are filtered out by mysql_install_db. diff --git a/scripts/mariadb_test_db.sql b/scripts/mariadb_test_db.sql index bbdc4e828e5..32226a1bda8 100644 --- a/scripts/mariadb_test_db.sql +++ b/scripts/mariadb_test_db.sql @@ -13,6 +13,8 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +SET NAMES latin1 COLLATE latin1_swedish_ci; + CREATE DATABASE IF NOT EXISTS test CHARACTER SET latin1 COLLATE latin1_swedish_ci; --- Fill "db" table with default grants for anyone to