diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-30 13:02:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-08-30 13:02:42 +0300 |
| commit | b86be02ecfbaab78e340bf4b59646816ea33a51f (patch) | |
| tree | 513fe95b1d7b2c73fdfeda98caf6f57fb851fc01 /extra/mariabackup/backup_mysql.cc | |
| parent | b9c2ae505dc3f57358c1b0cca7feb79e768e84fc (diff) | |
| parent | f410974f0f38999a08ad0d3f9c109ee184db7f31 (diff) | |
| download | mariadb-git-b86be02ecfbaab78e340bf4b59646816ea33a51f.tar.gz | |
Merge 10.6 into 10.7
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 a3041bc01e0..ea85c478997 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) { @@ -1843,8 +1843,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" @@ -1929,7 +1929,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() |