Bug 1896600: MariaDB <10.6 wants ON instead of 1 in config (#134)

diff --git a/docker/mysql/bugzilla-mysql56.cnf b/docker/mysql/bugzilla-mysql56.cnf
index 049ac45b5ca27392922b7018b3ef1c3bd3f7a9d8..eda0acbbba4292d7690e0907e9ddbd1356b3ac8e 100644 (file)
--- a/docker/mysql/bugzilla-mysql56.cnf
+++ b/docker/mysql/bugzilla-mysql56.cnf
@@ -1,8 +1,8 @@
 [mysqld]
 max_allowed_packet = 64M
 innodb_file_format    = Barracuda
-innodb_file_per_table = 1
-innodb_large_prefix   = 1
+innodb_file_per_table = ON
+innodb_large_prefix   = ON
 
 [mysql]
 max_allowed_packet = 64M

diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index c06dd64ae2f23586a1dd583e06665f69cc1dca80..54974aadb33647ec222d292d26b648eb47e42950 100644 (file)
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -412,8 +412,8 @@ END
   mysql_innodb_settings => <<'END',
 Bugzilla requires the following MySQL InnoDB settings:
 innodb_file_format = Barracuda
-innodb_file_per_table = 1
-innodb_large_prefix = 1
+innodb_file_per_table = ON
+innodb_large_prefix = ON
 END
   mysql_index_renaming => <<'END',
 We are about to rename old indexes. The estimated time to complete