diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-30 13:01:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-30 13:01:16 +0300 |
| commit | f410974f0f38999a08ad0d3f9c109ee184db7f31 (patch) | |
| tree | 50c2428f06deb3cd1d405c4f47f99a02dac27fa5 /extra/mariabackup | |
| parent | 966d22b715f00efaca358a8a798b20213a72ae09 (diff) | |
| parent | 29fa9bcee01cf5457c096bf37bb25c84ddee5a30 (diff) | |
| download | mariadb-git-f410974f0f38999a08ad0d3f9c109ee184db7f31.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'extra/mariabackup')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 8 | ||||
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 20 |
2 files changed, 17 insertions, 11 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index d87b16c7bfa..bc75a58d02e 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -343,7 +343,7 @@ check_server_version(unsigned long version_number, } /*********************************************************************//** -Receive options important for XtraBackup from MySQL server. +Receive options important for XtraBackup from server. @return true on success. */ bool get_mysql_vars(MYSQL *connection) { @@ -1842,8 +1842,8 @@ static std::string make_local_paths(const char *data_file_path) bool write_backup_config_file() { int rc= backup_file_printf("backup-my.cnf", - "# This MySQL options file was generated by innobackupex.\n\n" - "# The MySQL server\n" + "# This options file was generated by innobackupex.\n\n" + "# The server\n" "[mysqld]\n" "innodb_checksum_algorithm=%s\n" "innodb_data_file_path=%s\n" @@ -1928,7 +1928,7 @@ flush_changed_page_bitmaps() /*********************************************************************//** -Deallocate memory, disconnect from MySQL server, etc. +Deallocate memory, disconnect from server, etc. @return true on success. */ void backup_cleanup() diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 62a619587e3..386aa0764a6 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -6263,22 +6263,28 @@ static bool check_all_privileges() } /* KILL ... */ - if ((!opt_no_lock && (opt_kill_long_queries_timeout || opt_lock_ddl_per_table)) - /* START SLAVE SQL_THREAD */ - /* STOP SLAVE SQL_THREAD */ - || opt_safe_slave_backup) { + if (!opt_no_lock && (opt_kill_long_queries_timeout || opt_kill_long_query_type)) { check_result |= check_privilege( granted_privileges, - "SUPER", "*", "*", + "CONNECTION ADMIN", "*", "*", + PRIVILEGE_WARNING); + } + + /* START SLAVE SQL_THREAD */ + /* STOP SLAVE SQL_THREAD */ + if (opt_safe_slave_backup) { + check_result |= check_privilege( + granted_privileges, + "REPLICATION SLAVE ADMIN", "*", "*", PRIVILEGE_WARNING); } /* SHOW MASTER STATUS */ /* SHOW SLAVE STATUS */ if (opt_galera_info || opt_slave_info - || (opt_no_lock && opt_safe_slave_backup)) { + || opt_safe_slave_backup) { check_result |= check_privilege(granted_privileges, - "REPLICATION CLIENT", "*", "*", + "SLAVE MONITOR", "*", "*", PRIVILEGE_WARNING); } |