Merge branch 'main' into patch-1852154-harmony

bugzilla · Aug 20, 2024 · 86c6c4e · 86c6c4e
2 parents 0eec276 + 39cddb6
commit 86c6c4e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Bugzilla/DB/MariaDB.pm b/Bugzilla/DB/MariaDB.pm
@@ -654,7 +654,7 @@ sub bz_setup_database {
     print
       "Converting table storage format to $charset (collate $collate). This may take a while.\n";
     foreach my $table ($self->bz_table_list_real) {
-      my $info_sth = $self->prepare("SHOW FULL COLUMNS FROM $table");
+      my $info_sth = $self->prepare("SHOW FULL COLUMNS FROM " . $self->quote_identifier($table));
       $info_sth->execute();
       my (@binary_sql, @utf8_sql);
       while (my $column = $info_sth->fetchrow_hashref) {

diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
@@ -655,7 +655,7 @@ sub bz_setup_database {
     print
       "Converting table storage format to $charset (collate $collate). This may take a while.\n";
     foreach my $table ($self->bz_table_list_real) {
-      my $info_sth = $self->prepare("SHOW FULL COLUMNS FROM $table");
+      my $info_sth = $self->prepare("SHOW FULL COLUMNS FROM " . $self->quote_identifier($table));
       $info_sth->execute();
       my (@binary_sql, @utf8_sql);
       while (my $column = $info_sth->fetchrow_hashref) {

diff --git 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
@@ -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