mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

mariabackup: remove MySQL wording

Browse source
This commit is contained in:
Daniel Black 2022-08-26 10:20:26 +10:00
parent 79b58f1ca8
commit 0324bde846
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
extra/mariabackup/backup_mysql.cc
View file

@ -126,7 +126,7 @@ xb_mysql_connect()
mysql_options(connection, MYSQL_OPT_PROTOCOL, &opt_protocol); mysql_options(connection, MYSQL_OPT_PROTOCOL, &opt_protocol);
mysql_options(connection,MYSQL_SET_CHARSET_NAME, "utf8"); 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", "port: %s, socket: %s", opt_host ? opt_host : "localhost",
opt_user ? opt_user : "not set", opt_user ? opt_user : "not set",
opt_password ? "set" : "not set", opt_password ? "set" : "not set",
@ -153,7 +153,7 @@ xb_mysql_connect()
opt_password, opt_password,
"" /*database*/, opt_port, "" /*database*/, opt_port,
opt_socket, 0)) { 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); mysql_close(connection);
return(NULL); 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. */ @return true on success. */
bool get_mysql_vars(MYSQL *connection) 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() bool write_backup_config_file()
{ {
int rc= backup_file_printf("backup-my.cnf", int rc= backup_file_printf("backup-my.cnf",
"# This MySQL options file was generated by innobackupex.\n\n" "# This options file was generated by innobackupex.\n\n"
"# The MySQL server\n" "# The server\n"
"[mysqld]\n" "[mysqld]\n"
"innodb_checksum_algorithm=%s\n" "innodb_checksum_algorithm=%s\n"
"innodb_data_file_path=%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. */ @return true on success. */
void void
backup_cleanup() backup_cleanup()