Skip to content
/ server Public

Commit 18edb09

Browse files
committed
Fixing mariadb-install-db.exe failure on Windows (Illegal mix of collations)
1 parent 283b928 commit 18edb09

File tree

5 files changed

+9
-1
lines changed

5 files changed

+9
-1
lines changed

scripts/fill_help_tables.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
-- mysql -u root -p mysql < file_name
2424

25-
set names 'utf8';
25+
SET NAMES utf8mb3 COLLATE utf8mb3_general_ci;
2626

2727
set sql_log_bin = 0;
2828

scripts/mariadb_performance_tables.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
-- performance schema engine.
1010
--
1111

12+
SET NAMES latin1 COLLATE latin1_swedish_ci;
13+
1214
set @have_old_pfs= (select count(*) from information_schema.schemata where schema_name='performance_schema');
1315

1416
SET @cmd="SET @broken_tables = (select count(*) from information_schema.tables where engine != 'PERFORMANCE_SCHEMA' and table_schema='performance_schema')";

scripts/mariadb_system_tables.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
-- The system tables of MySQL Server
1919
--
2020

21+
SET NAMES latin1 COLLATE latin1_swedish_ci;
22+
2123
set sql_mode='';
2224

2325
set @orig_storage_engine=@@default_storage_engine;

scripts/mariadb_system_tables_data.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
-- The initial data for system tables of MySQL Server
1818
--
1919

20+
SET NAMES latin1 COLLATE latin1_swedish_ci;
21+
2022
-- When setting up a "cross bootstrap" database (e.g., creating data on a Unix
2123
-- host which will later be included in a Windows zip file), any lines
2224
-- containing "@current_hostname" are filtered out by mysql_install_db.

scripts/mariadb_test_db.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
-- along with this program; if not, write to the Free Software
1414
-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

16+
SET NAMES latin1 COLLATE latin1_swedish_ci;
17+
1618
CREATE DATABASE IF NOT EXISTS test CHARACTER SET latin1 COLLATE latin1_swedish_ci;
1719

1820
--- Fill "db" table with default grants for anyone to

0 commit comments

Comments
 (0)