Browse Source

Merge branch 'TechEmpower:master' into master

Huang ziquan 1 year ago
parent
commit
edcfa4ae3b
2 changed files with 3 additions and 2 deletions
  1. 2 1
      toolset/databases/mysql/my.cnf
  2. 1 1
      toolset/databases/mysql/mysql.dockerfile

+ 2 - 1
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

+ 1 - 1
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