Merge branch 'TechEmpower:master' into master

hggq · May 15, 2024 · edcfa4a · edcfa4a
2 parents 858f443 + 2a5c99b
commit edcfa4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/toolset/databases/mysql/my.cnf b/toolset/databases/mysql/my.cnf
@@ -16,7 +16,8 @@ default-character-set=utf8
 # * Basic Settings
 #
 default-storage-engine = innodb
-default_authentication_plugin = mysql_native_password
+mysql_native_password = ON
+#default_authentication_plugin = mysql_native_password
 
 user            = mysql
 pid-file        = /var/run/mysqld/mysqld.pid

diff --git a/toolset/databases/mysql/mysql.dockerfile b/toolset/databases/mysql/mysql.dockerfile
@@ -1,4 +1,4 @@
-FROM mysql:8.3
+FROM mysql:8.4
 
 ENV MYSQL_ROOT_PASSWORD=root
 ENV MYSQL_USER=benchmarkdbuser