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

diff --git a/docker/mysql/bugzilla.cnf b/docker/mysql/bugzilla.cnf
index ab320b3c6416fbc9fbd1d7c0ca90ff9769f2ffba..6f8ba4778beafacf8b5055d70c862e45b1200cee 100644 (file)
--- a/docker/mysql/bugzilla.cnf
+++ b/docker/mysql/bugzilla.cnf
@@ -1,8 +1,9 @@
 [mysqld]
 max_allowed_packet = 1G
-innodb_file_per_table = 1
-innodb_large_prefix   = 1
+innodb_file_per_table = ON
+innodb_large_prefix   = ON
 innodb_file_format = Barracuda
+ft_min_word_len = 2
 
 [mysql]
 max_allowed_packet = 1G

diff --git a/docs/en/rst/installing/mariadb.rst b/docs/en/rst/installing/mariadb.rst
index 8cf625f0a3930bb22708986ad937ac6bd092b542..c62433afbaab1c404bfcab861b26e04b05f43f14 100644 (file)
--- a/docs/en/rst/installing/mariadb.rst
+++ b/docs/en/rst/installing/mariadb.rst
@@ -34,17 +34,6 @@ on your machine, if it didn't come with it already.
 If you did install MariaDB manually rather than from a package, make sure the
 server is started when the machine boots.
 
-Create the Database
-===================
-
-You need to create a database for Bugzilla to use. Run the :file:`mariadb` 
-command-line client and enter:
-
-::
-    CREATE DATABASE IF NOT EXISTS bugs CHARACTER SET = 'utf8';
-
-The above command makes sure a database like that doesn't exist already.
-
 .. _mysql-add-user:
 
 Add a User
@@ -55,10 +44,12 @@ command-line client and enter:
 
 ::
 
+    CREATE USER 'bugs'@'localhost' IDENTIFIED BY '$DB_PASS';
+
     GRANT SELECT, INSERT,
     UPDATE, DELETE, INDEX, ALTER, CREATE, LOCK TABLES,
     CREATE TEMPORARY TABLES, DROP, REFERENCES ON bugs.*
-    TO bugs@localhost IDENTIFIED BY '$DB_PASS';
+    TO 'bugs'@'localhost';
 
 You need to replace ``$DB_PASS`` with a strong password you have chosen.
 Write that password down somewhere.

diff --git a/docs/en/rst/installing/quick-start.rst b/docs/en/rst/installing/quick-start.rst
index d2edba755bc6e3c465edbb92b3a6eaeee4303434..5b58563ada14d70398bf20b28c34f165e2216940 100644 (file)
--- a/docs/en/rst/installing/quick-start.rst
+++ b/docs/en/rst/installing/quick-start.rst
@@ -71,18 +71,9 @@ second command to finish. If you start another terminal, you will need to
 Configure MariaDB
 =================
 
-The following instructions use the simple :file:`nano` editor, but feel
-free to use any text editor you are comfortable with.
+Put in the server settings that Bugzilla needs:
 
-:command:`nano /etc/mysql/mariadb.conf.d/50-server.cnf`
-
-Set the following values, which increase the maximum attachment size and
-make it possible to search for short words and terms:
-
-* Uncomment and alter on Line 34 to have a value of at least: ``max_allowed_packet=100M``
-* Add a new line 42, in the ``[mysqld]`` section: ``ft_min_word_len=2``
-
-Save and exit.
+:command:`cp docker/mysql/bugzilla.cnf /etc/mysql/conf.d/bugzilla.cnf`
 
 Then, add a user to MariaDB for Bugzilla to use:
 

diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index b88f0c0ecb5cc1b750631dcb2a1b76db97fe1dbc..649e3d5f85ea9fe475711fbc9535d1e2bb075451 100644 (file)
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -366,8 +366,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