diff --git a/plugins/mysql-apt/index.py b/plugins/mysql-apt/index.py index 1c7636347..a82a460d7 100755 --- a/plugins/mysql-apt/index.py +++ b/plugins/mysql-apt/index.py @@ -2501,8 +2501,15 @@ def doFullSyncUser(version=''): return data[1] sync_db = args['db'] + sync_db_import = args['db'] + if sync_db.lower() == 'all': - sync_db = '--all-databases' + sync_db_import = '' + dbs = findBinlogSlaveDoDb() + dbs_str = '' + for x in dbs: + dbs_str += ' ' + x + sync_db = "--databases " + dbs_str.strip() sync_sign = args['sign'] @@ -2542,7 +2549,7 @@ def doFullSyncUser(version=''): pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root') sock = getSocketFile() my_import_cmd = getServerDir() + '/bin/usr/bin/mysql -S ' + sock + ' -uroot -p' + pwd + \ - ' ' + sync_db + ' < ' + bak_file + ' ' + sync_db_import + ' < ' + bak_file mw.execShell(my_import_cmd) if version == '8.0': diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py index 0296affde..2539c7de9 100755 --- a/plugins/mysql-yum/index.py +++ b/plugins/mysql-yum/index.py @@ -2450,8 +2450,15 @@ def doFullSyncUser(version=''): return data[1] sync_db = args['db'] + sync_db_import = args['db'] + if sync_db.lower() == 'all': - sync_db = '--all-databases' + sync_db_import = '' + dbs = findBinlogSlaveDoDb() + dbs_str = '' + for x in dbs: + dbs_str += ' ' + x + sync_db = "--databases " + dbs_str.strip() sync_sign = args['sign'] @@ -2491,7 +2498,7 @@ def doFullSyncUser(version=''): pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root') sock = getSocketFile() my_import_cmd = getServerDir() + '/bin/usr/bin/mysql -S ' + sock + ' -uroot -p' + pwd + \ - ' ' + sync_db + ' < ' + bak_file + ' ' + sync_db_import + ' < ' + bak_file mw.execShell(my_import_cmd) if version == '8.0': diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index 0bdba5166..4b9d4cb92 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -2664,9 +2664,15 @@ def doFullSyncUser(version=''): return data[1] sync_db = args['db'] + sync_db_import = args['db'] if sync_db.lower() == 'all': - sync_db = '--all-databases' + sync_db_import = '' + dbs = findBinlogSlaveDoDb() + dbs_str = '' + for x in dbs: + dbs_str += ' ' + x + sync_db = "--databases " + dbs_str.strip() sync_sign = args['sign'] @@ -2706,7 +2712,8 @@ def doFullSyncUser(version=''): pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root') sock = getSocketFile() my_import_cmd = getServerDir() + '/bin/mysql -S ' + sock + ' -uroot -p' + pwd + \ - ' ' + sync_db + ' < ' + bak_file + ' ' + sync_db_import + ' < ' + bak_file + # print(my_import_cmd) mw.execShell(my_import_cmd) if version == '8.0':