diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-30 13:33:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-30 13:33:02 +0300 |
| commit | e71aca8200558d590f8b1b8dbafa9693fcf5078b (patch) | |
| tree | 13b6bb1f06307266c08df7ca8515ede4616481d5 /extra/mariabackup/backup_mysql.cc | |
| parent | 259050f864f5417fd047d16a793933e34941f1b4 (diff) | |
| parent | 50d6966c503c7fdc7121eb1756b27c66b12fe0bb (diff) | |
| download | mariadb-git-e71aca8200558d590f8b1b8dbafa9693fcf5078b.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'extra/mariabackup/backup_mysql.cc')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index 0e5c9e43e68..9a09da21d74 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -305,7 +305,7 @@ check_server_version(ulong version_number, const char *version_string) } /*********************************************************************//** -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) { @@ -1773,8 +1773,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" @@ -1859,7 +1859,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() |