From a11e43f9a5e1f41a283058fe31028bb72ab4e6a6 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 4 Jul 2024 02:47:57 +0800 Subject: [PATCH] update --- plugins/mysql-apt/index.py | 4 ++-- plugins/mysql-yum/index.py | 3 ++- plugins/mysql/index.py | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py index 4bd0cd92b..d72165394 100755 --- a/plugins/mysql-apt/index.py +++ b/plugins/mysql-apt/index.py @@ -1511,8 +1511,8 @@ def resetDbRootPwd(version): pwd = mw.getRandomString(16) pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,)) - - if float(version) < 5.7: + mdb8 = getMdb8Ver() + if not mw.inArray(mdb8, version): cmd_pass = serverdir + '/bin/usr/bin/mysql --defaults-file=' + myconf + ' -uroot -e' cmd_pass = cmd_pass + '"UPDATE mysql.user SET password=PASSWORD(\'' + pwd + "') WHERE user='root';" cmd_pass = cmd_pass + 'flush privileges;"' diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py index 46ace42ef..2ae1f3d9f 100755 --- a/plugins/mysql-yum/index.py +++ b/plugins/mysql-yum/index.py @@ -1501,7 +1501,8 @@ def resetDbRootPwd(version): pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,)) - if float(version) < 5.7: + mdb8 = getMdb8Ver() + if not mw.inArray(mdb8, version): cmd_pass = serverdir + '/bin/usr/bin/mysql --defaults-file=' + myconf + ' -uroot -e' cmd_pass = cmd_pass + '"UPDATE mysql.user SET password=PASSWORD(\'' + pwd + "') WHERE user='root';" cmd_pass = cmd_pass + 'flush privileges;"' diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index 6e626d218..11b4f9254 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -1721,7 +1721,8 @@ def resetDbRootPwd(version): pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,)) - if float(version) < 5.7: + mdb8 = getMdb8Ver() + if not mw.inArray(mdb8, version): cmd_pass = serverdir + '/bin/mysql --defaults-file=' + myconf + ' -uroot -e' cmd_pass = cmd_pass + '"UPDATE mysql.user SET password=PASSWORD(\'' + pwd + "') WHERE user='root';" cmd_pass = cmd_pass + 'flush privileges;"'