summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2022-08-26 10:20:26 +1000
committerDaniel Black <daniel@mariadb.org>2022-08-26 11:52:53 +1000
commit0324bde8469f37ecf0ca8aa3357c436d04d44316 (patch)
tree433dcfd317f2c11361e579763695bd6bd7b6f11e
parent79b58f1ca893b8affc5075d0a548563d376cd481 (diff)
downloadmariadb-git-0324bde8469f37ecf0ca8aa3357c436d04d44316.tar.gz
mariabackup: remove MySQL wording
-rw-r--r--extra/mariabackup/backup_mysql.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc
index 7a629e7265c..3cfbf5fbfb6 100644
--- a/extra/mariabackup/backup_mysql.cc
+++ b/extra/mariabackup/backup_mysql.cc
@@ -126,7 +126,7 @@ xb_mysql_connect()
mysql_options(connection, MYSQL_OPT_PROTOCOL, &opt_protocol);
mysql_options(connection,MYSQL_SET_CHARSET_NAME, "utf8");
- msg("Connecting to MySQL server host: %s, user: %s, password: %s, "
+ msg("Connecting to server host: %s, user: %s, password: %s, "
"port: %s, socket: %s", opt_host ? opt_host : "localhost",
opt_user ? opt_user : "not set",
opt_password ? "set" : "not set",
@@ -153,7 +153,7 @@ xb_mysql_connect()
opt_password,
"" /*database*/, opt_port,
opt_socket, 0)) {
- msg("Failed to connect to MySQL server: %s.", mysql_error(connection));
+ msg("Failed to connect to server: %s.", mysql_error(connection));
mysql_close(connection);
return(NULL);
}
@@ -342,7 +342,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)
{
@@ -1837,8 +1837,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"
@@ -1923,7 +1923,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()